Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show name instead of ID in recent changes 

See https://github.com/Martchus/syncthingtray/issues/115
This commit is contained in:
Martchus 2021-10-19 23:35:28 +02:00
parent 5ef0523458
commit be92d5366c
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
model/syncthingrecentchangesmodel.cpp
View File

@ -99,7 +99,7 @@ QVariant SyncthingRecentChangesModel::data(const QModelIndex &index, int role) c
case 0: case 0:
return change.fileChange.action; return change.fileChange.action;
case 1: case 1:
return change.fileChange.modifiedBy; return change.deviceName.isEmpty() ? change.fileChange.modifiedBy : change.deviceName;
case 2: case 2:
return change.directoryId; return change.directoryId;
case 3: case 3:
@ -118,6 +118,8 @@ QVariant SyncthingRecentChangesModel::data(const QModelIndex &index, int role) c
case 0: case 0:
return QString((change.fileChange.local ? tr("Locally") : tr("Remotely")) % QChar(' ') % change.fileChange.action % QStringLiteral(", ") return QString((change.fileChange.local ? tr("Locally") : tr("Remotely")) % QChar(' ') % change.fileChange.action % QStringLiteral(", ")
% QString::fromStdString(change.fileChange.eventTime.toString(DateTimeOutputFormat::DateAndTime, true))); % QString::fromStdString(change.fileChange.eventTime.toString(DateTimeOutputFormat::DateAndTime, true)));
case 1:
return change.deviceId.isEmpty() ? change.fileChange.modifiedBy : change.deviceId;
case 3: case 3:
return change.fileChange.path; // usually too long so add a tooltip return change.fileChange.path; // usually too long so add a tooltip
} }
@ -125,7 +127,7 @@ QVariant SyncthingRecentChangesModel::data(const QModelIndex &index, int role) c
case Action: case Action:
return change.fileChange.action; return change.fileChange.action;
case ModifiedBy: case ModifiedBy:
return change.fileChange.modifiedBy; return change.deviceName.isEmpty() ? change.fileChange.modifiedBy : change.deviceName;
case DirectoryId: case DirectoryId:
return change.directoryId; return change.directoryId;
case DirectoryName: case DirectoryName:
@ -177,12 +179,21 @@ void SyncthingRecentChangesModel::fileChanged(const SyncthingDir &dir, int index
{ {
Q_UNUSED(index) Q_UNUSED(index)
const SyncthingDev *relatedDev = nullptr;
for (const SyncthingDev &dev : m_connection.devInfo()) {
if (dev.id.startsWith(change.modifiedBy)) {
relatedDev = &dev;
break;
}
}
if (index >= 0) { if (index >= 0) {
beginInsertRows(QModelIndex(), 0, 0); beginInsertRows(QModelIndex(), 0, 0);
} }
m_changes.emplace_front(SyncthingRecentChange{ m_changes.emplace_front(SyncthingRecentChange{
.directoryId = dir.id, .directoryId = dir.id,
.directoryName = dir.displayName(), .directoryName = dir.displayName(),
.deviceId = relatedDev ? relatedDev->id : QString(),
.deviceName = relatedDev ? relatedDev->name : QString(),
.fileChange = change, .fileChange = change,
}); });
if (index >= 0) { if (index >= 0) {

2
model/syncthingrecentchangesmodel.h
View File

@ -13,6 +13,8 @@ namespace Data {
struct LIB_SYNCTHING_MODEL_EXPORT SyncthingRecentChange { struct LIB_SYNCTHING_MODEL_EXPORT SyncthingRecentChange {
QString directoryId; QString directoryId;
QString directoryName; QString directoryName;
QString deviceId;
QString deviceName;
SyncthingFileChange fileChange; SyncthingFileChange fileChange;
}; };