diff options
| author | Christian Kamm <mail@ckamm.de> | 2018-01-23 16:11:20 +0300 |
|---|---|---|
| committer | Camila San <hello@camila.codes> | 2018-05-15 18:58:10 +0300 |
| commit | ad750f569cfdf33a17e9f13a04b0b52be733ff72 (patch) | |
| tree | 1cd340ce55c631759ad2696c55b04bb2b1bc704b /src/gui/folderman.h | |
| parent | 5e2270bd570c06905c5be953f7d1eaa055d503ac (diff) | |
Tray: Change icon for unresolved conflicts #6277upstream/pr/6277
Diffstat (limited to 'src/gui/folderman.h')
| -rw-r--r-- | src/gui/folderman.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/folderman.h b/src/gui/folderman.h index 44291dd74..3eb6024e2 100644 --- a/src/gui/folderman.h +++ b/src/gui/folderman.h @@ -106,9 +106,12 @@ public: /** Creates a new and empty local directory. */ bool startFromScratch(const QString &); - QString statusToString(SyncResult::Status, bool paused) const; + /// Produce text for use in the tray tooltip + static QString trayTooltipStatusString(SyncResult::Status syncStatus, bool hasUnresolvedConflicts, bool paused); - static SyncResult accountStatus(const QList<Folder *> &folders); + /// Compute status summarizing multiple folders + static void trayOverallStatus(const QList<Folder *> &folders, + SyncResult::Status *status, bool *unresolvedConflicts); // Escaping of the alias which is used in QSettings AND the file // system, thus need to be escaped. |