From d5b84b28620f2c830734451703e891dd466808f7 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Thu, 29 Aug 2024 17:31:04 +0200 Subject: [PATCH 1/2] gui: add some extra syncing details to the tray tooltips There was some unused code that updated some status bar text -- this is now part of the tooltip during syncing. Signed-off-by: Jyrki Gadinger --- src/gui/folderman.cpp | 40 +++++++++++++++++++++++++++++++---- src/gui/folderman.h | 5 ++--- src/gui/owncloudgui.cpp | 45 +++++++++------------------------------- src/libsync/syncengine.h | 5 +++++ 4 files changed, 53 insertions(+), 42 deletions(-) diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp index 0dc60e626b8b3..5c6539a0f99e9 100644 --- a/src/gui/folderman.cpp +++ b/src/gui/folderman.cpp @@ -1610,18 +1610,21 @@ void FolderMan::slotLeaveShare(const QString &localFile, const QByteArray &folde } void FolderMan::trayOverallStatus(const QList &folders, - SyncResult::Status *status, bool *unresolvedConflicts) + SyncResult::Status *status, + bool *unresolvedConflicts, + ProgressInfo **const overallProgressInfo) { *status = SyncResult::Undefined; *unresolvedConflicts = false; const auto cnt = folders.count(); - // if one folder: show the state of the one folder. + // if one folder: show the state of the one folder along with the sync status. // if more folders: // if one of them has an error -> show error // if one is paused, but others ok, show ok // do not show "problem" in the tray + // and do not show sync status // if (cnt == 1) { const auto folder = folders.at(0); @@ -1644,6 +1647,7 @@ void FolderMan::trayOverallStatus(const QList &folders, } } *unresolvedConflicts = syncResult.hasUnresolvedConflicts(); + *overallProgressInfo = folder->syncEngine().progressInfo(); } } else { auto errorsSeen = false; @@ -1710,8 +1714,7 @@ void FolderMan::trayOverallStatus(const QList &folders, } } -QString FolderMan::trayTooltipStatusString( - SyncResult::Status syncStatus, bool hasUnresolvedConflicts, bool paused) +QString FolderMan::trayTooltipStatusString(SyncResult::Status syncStatus, bool hasUnresolvedConflicts, bool paused, ProgressInfo *const progress) { QString folderMessage; switch (syncStatus) { @@ -1725,6 +1728,35 @@ QString FolderMan::trayTooltipStatusString( folderMessage = tr("Preparing for sync."); break; case SyncResult::SyncRunning: + if (progress && progress->status() == ProgressInfo::Propagation) { + const auto estimatedEta = progress->totalProgress().estimatedEta; + if (progress->totalSize() == 0) { + qint64 currentFile = progress->currentFile(); + qint64 totalFileCount = qMax(progress->totalFiles(), currentFile); + if (progress->trustEta()) { + if (estimatedEta == 0) { + folderMessage = tr("Syncing %1 of %2 (A few seconds left)").arg(currentFile).arg(totalFileCount); + } else { + folderMessage = + tr("Syncing %1 of %2 (%3 left)").arg(currentFile).arg(totalFileCount).arg(Utility::durationToDescriptiveString1(estimatedEta)); + } + } else { + folderMessage = tr("Syncing %1 of %2").arg(currentFile).arg(totalFileCount); + } + } else { + QString totalSizeStr = Utility::octetsToString(progress->totalSize()); + if (progress->trustEta()) { + if (estimatedEta == 0) { + folderMessage = tr("Syncing %1 (A few seconds left)").arg(totalSizeStr, Utility::durationToDescriptiveString1(estimatedEta)); + } else { + folderMessage = tr("Syncing %1 (%2 left)").arg(totalSizeStr, Utility::durationToDescriptiveString1(estimatedEta)); + } + } else { + folderMessage = tr("Syncing %1").arg(totalSizeStr); + } + } + break; + } folderMessage = tr("Sync is running."); break; case SyncResult::Success: diff --git a/src/gui/folderman.h b/src/gui/folderman.h index 0fcffc9fdd16c..f41be2fde02ad 100644 --- a/src/gui/folderman.h +++ b/src/gui/folderman.h @@ -137,11 +137,10 @@ class FolderMan : public QObject bool startFromScratch(const QString &); /// Produce text for use in the tray tooltip - static QString trayTooltipStatusString(SyncResult::Status syncStatus, bool hasUnresolvedConflicts, bool paused); + static QString trayTooltipStatusString(SyncResult::Status syncStatus, bool hasUnresolvedConflicts, bool paused, ProgressInfo *progress); /// Compute status summarizing multiple folders - static void trayOverallStatus(const QList &folders, - SyncResult::Status *status, bool *unresolvedConflicts); + static void trayOverallStatus(const QList &folders, SyncResult::Status *status, bool *unresolvedConflicts, ProgressInfo **overallProgressInfo); // Escaping of the alias which is used in QSettings AND the file // system, thus need to be escaped. diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 9cc24ef7ae617..ae0b210a87550 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -32,6 +32,7 @@ #include "theme.h" #include "wheelhandler.h" #include "syncconflictsmodel.h" +#include "syncengine.h" #include "filedetails/datefieldbackend.h" #include "filedetails/filedetails.h" #include "filedetails/shareemodel.h" @@ -383,7 +384,8 @@ void ownCloudGui::slotComputeOverallSyncStatus() SyncResult::Status overallStatus = SyncResult::Undefined; bool hasUnresolvedConflicts = false; - FolderMan::trayOverallStatus(map.values(), &overallStatus, &hasUnresolvedConflicts); + ProgressInfo *overallProgressInfo = nullptr; + FolderMan::trayOverallStatus(map.values(), &overallStatus, &hasUnresolvedConflicts, &overallProgressInfo); #ifdef BUILD_FILE_PROVIDER_MODULE if (!problemFileProviderAccounts.isEmpty()) { @@ -420,16 +422,16 @@ void ownCloudGui::slotComputeOverallSyncStatus() #endif #ifdef Q_OS_WIN // Windows has a 128-char tray tooltip length limit. - trayMessage = folderMan->trayTooltipStatusString(overallStatus, hasUnresolvedConflicts, false); + trayMessage = folderMan->trayTooltipStatusString(overallStatus, hasUnresolvedConflicts, false, overallProgressInfo); #else QStringList allStatusStrings; const auto folders = map.values(); for (const auto folder : folders) { - QString folderMessage = FolderMan::trayTooltipStatusString( - folder->syncResult().status(), - folder->syncResult().hasUnresolvedConflicts(), - folder->syncPaused()); - allStatusStrings += tr("Folder %1: %2").arg(folder->shortGuiLocalPath(), folderMessage); + QString folderMessage = FolderMan::trayTooltipStatusString(folder->syncResult().status(), + folder->syncResult().hasUnresolvedConflicts(), + folder->syncPaused(), + folder->syncEngine().progressInfo()); + allStatusStrings += tr("%1: %2").arg(folder->shortGuiLocalPath(), folderMessage); } #ifdef BUILD_FILE_PROVIDER_MODULE for (const auto &accountId : syncingFileProviderAccounts) { @@ -502,7 +504,6 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo & { Q_UNUSED(folder); - // FIXME: Lots of messages computed for nothing in this method, needs revisiting if (progress.status() == ProgressInfo::Discovery) { #if 0 if (!progress._currentDiscoveredRemoteFolder.isEmpty()) { @@ -520,33 +521,7 @@ void ownCloudGui::slotUpdateProgress(const QString &folder, const ProgressInfo & return; } - if (progress.totalSize() == 0) { - qint64 currentFile = progress.currentFile(); - qint64 totalFileCount = qMax(progress.totalFiles(), currentFile); - QString msg; - if (progress.trustEta()) { - msg = tr("Syncing %1 of %2 (%3 left)") - .arg(currentFile) - .arg(totalFileCount) - .arg(Utility::durationToDescriptiveString2(progress.totalProgress().estimatedEta)); - } else { - msg = tr("Syncing %1 of %2") - .arg(currentFile) - .arg(totalFileCount); - } - //_actionStatus->setText(msg); - } else { - QString totalSizeStr = Utility::octetsToString(progress.totalSize()); - QString msg; - if (progress.trustEta()) { - msg = tr("Syncing %1 (%2 left)") - .arg(totalSizeStr, Utility::durationToDescriptiveString2(progress.totalProgress().estimatedEta)); - } else { - msg = tr("Syncing %1") - .arg(totalSizeStr); - } - //_actionStatus->setText(msg); - } + slotComputeOverallSyncStatus(); if (!progress._lastCompletedItem.isEmpty()) { diff --git a/src/libsync/syncengine.h b/src/libsync/syncengine.h index af234725cf2d8..ea9b3c21ad004 100644 --- a/src/libsync/syncengine.h +++ b/src/libsync/syncengine.h @@ -78,6 +78,11 @@ class OWNCLOUDSYNC_EXPORT SyncEngine : public QObject [[nodiscard]] SyncOptions syncOptions() const { return _syncOptions; } [[nodiscard]] bool ignoreHiddenFiles() const { return _ignore_hidden_files; } + [[nodiscard]] ProgressInfo *progressInfo() const + { + return _progressInfo.get(); + } + [[nodiscard]] ExcludedFiles &excludedFiles() const { return *_excludedFiles; } [[nodiscard]] SyncFileStatusTracker &syncFileStatusTracker() const { return *_syncFileStatusTracker; } From 1fd0283e8be2122fc88cae2facec23d52109c049 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Mon, 2 Sep 2024 18:16:25 +0200 Subject: [PATCH 2/2] gui: remove Systray::setToolTip Signed-off-by: Jyrki Gadinger --- src/gui/systray.cpp | 5 ----- src/gui/systray.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp index c4d4672fe621b..a0153911e97ee 100644 --- a/src/gui/systray.cpp +++ b/src/gui/systray.cpp @@ -566,11 +566,6 @@ void Systray::showTalkMessage(const QString &title, const QString &message, cons #endif } -void Systray::setToolTip(const QString &tip) -{ - QSystemTrayIcon::setToolTip(tr("%1: %2").arg(Theme::instance()->appNameGUI(), tip)); -} - bool Systray::syncIsPaused() const { return _syncIsPaused; diff --git a/src/gui/systray.h b/src/gui/systray.h index cff48f33d5b35..7b17bab423aae 100644 --- a/src/gui/systray.h +++ b/src/gui/systray.h @@ -122,7 +122,6 @@ public slots: void showMessage(const QString &title, const QString &message, QSystemTrayIcon::MessageIcon icon = Information); void showUpdateMessage(const QString &title, const QString &message, const QUrl &webUrl); void showTalkMessage(const QString &title, const QString &message, const QString &replyTo, const QString &token, const OCC::AccountStatePtr &accountState); - void setToolTip(const QString &tip); void createCallDialog(const OCC::Activity &callNotification, const OCC::AccountStatePtr accountState); void createEditFileLocallyLoadingDialog(const QString &fileName);