Skip to content

Commit

Permalink
Improve syncing information given to user by changing the text.
Browse files Browse the repository at this point in the history
Signed-off-by: Camila Ayres <[email protected]>
  • Loading branch information
camilasan committed Jul 5, 2024
1 parent 0498f2a commit ed2ec16
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/gui/folderstatusmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1003,7 +1003,7 @@ void FolderStatusModel::slotSetProgress(const ProgressInfo &progress)
}

if (progress.status() == ProgressInfo::Reconcile) {
subFolderProgress->_overallSyncString = tr("Reconciling changes");
subFolderProgress->_overallSyncString = tr("Reconciling local and remote changes");
emit dataChanged(index(folderIndex), index(folderIndex), roles);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/tray/syncstatussummary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ void SyncStatusSummary::setSyncStateForFolder(const Folder *folder)
case SyncResult::NotYetStarted:
setSyncing(true);
if (totalFiles() <= 0) {

Check warning on line 158 in src/gui/tray/syncstatussummary.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/tray/syncstatussummary.cpp:158:9 [bugprone-branch-clone]

if with identical then and else branches

Check warning on line 158 in src/gui/tray/syncstatussummary.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/tray/syncstatussummary.cpp:158:9 [bugprone-branch-clone]

if with identical then and else branches
setSyncStatusString(tr("Preparing sync"));
setSyncStatusString(tr("Checking folder changes"));
} else {
setSyncStatusString(tr("Syncing"));
setSyncStatusString(tr("Syncing changes"));
}
setSyncStatusDetailString("");
setSyncIcon(Theme::instance()->syncStatusRunning());
Expand Down

0 comments on commit ed2ec16

Please sign in to comment.