mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-27 06:45:49 +03:00
Remove vfs warning in the delegate, indicate them in the description instead
Fixes: #8139
This commit is contained in:
parent
93152761a1
commit
60011e8003
3 changed files with 13 additions and 4 deletions
|
@ -166,8 +166,8 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
|
||||||
auto itemString = qvariant_cast<QString>(index.data(SyncProgressItemString));
|
auto itemString = qvariant_cast<QString>(index.data(SyncProgressItemString));
|
||||||
auto warningCount = qvariant_cast<int>(index.data(WarningCount));
|
auto warningCount = qvariant_cast<int>(index.data(WarningCount));
|
||||||
auto syncOngoing = qvariant_cast<bool>(index.data(SyncRunning));
|
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 syncEnabled = qvariant_cast<bool>(index.data(FolderAccountConnected));
|
||||||
|
auto syncText = qvariant_cast<QString>(index.data(FolderSyncText));
|
||||||
|
|
||||||
auto iconRect = option.rect;
|
auto iconRect = option.rect;
|
||||||
auto aliasRect = option.rect;
|
auto aliasRect = option.rect;
|
||||||
|
@ -251,7 +251,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
|
||||||
if (!showProgess) {
|
if (!showProgess) {
|
||||||
painter->setFont(subFont);
|
painter->setFont(subFont);
|
||||||
QString elidedRemotePathText = subFm.elidedText(
|
QString elidedRemotePathText = subFm.elidedText(
|
||||||
tr("Synchronized with local folder (%1)").arg(syncDate.toTimeSpec(Qt::LocalTime).toString(Qt::SystemLocaleShortDate)),
|
syncText,
|
||||||
Qt::ElideRight, remotePathRect.width());
|
Qt::ElideRight, remotePathRect.width());
|
||||||
painter->drawText(QStyle::visualRect(option.direction, option.rect, remotePathRect),
|
painter->drawText(QStyle::visualRect(option.direction, option.rect, remotePathRect),
|
||||||
textAlign, elidedRemotePathText);
|
textAlign, elidedRemotePathText);
|
||||||
|
|
|
@ -46,7 +46,10 @@ public:
|
||||||
SyncRunning,
|
SyncRunning,
|
||||||
SyncDate,
|
SyncDate,
|
||||||
|
|
||||||
AddButton // 1 = enabled; 2 = disabled
|
AddButton, // 1 = enabled; 2 = disabled
|
||||||
|
FolderSyncText,
|
||||||
|
DataRoleCount
|
||||||
|
|
||||||
};
|
};
|
||||||
void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override;
|
void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override;
|
||||||
QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const override;
|
QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const override;
|
||||||
|
|
|
@ -219,7 +219,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
|
||||||
case FolderStatusDelegate::FolderErrorMsg:
|
case FolderStatusDelegate::FolderErrorMsg:
|
||||||
return f->syncResult().errorStrings();
|
return f->syncResult().errorStrings();
|
||||||
case FolderStatusDelegate::FolderInfoMsg:
|
case FolderStatusDelegate::FolderInfoMsg:
|
||||||
return f->supportsVirtualFiles()
|
return f->supportsVirtualFiles() && f->vfs().mode() != Vfs::Mode::WindowsCfApi
|
||||||
? QStringList(tr("Virtual file support is enabled."))
|
? QStringList(tr("Virtual file support is enabled."))
|
||||||
: QStringList();
|
: QStringList();
|
||||||
case FolderStatusDelegate::SyncRunning:
|
case FolderStatusDelegate::SyncRunning:
|
||||||
|
@ -282,6 +282,12 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
|
||||||
return progress._overallPercent;
|
return progress._overallPercent;
|
||||||
case FolderStatusDelegate::SyncProgressOverallString:
|
case FolderStatusDelegate::SyncProgressOverallString:
|
||||||
return progress._overallSyncString;
|
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();
|
return QVariant();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue