diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 1ab9ce9d5616f..bda11be25e081 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -362,9 +362,9 @@ void ownCloudGui::slotComputeOverallSyncStatus() _tray->setToolTip(tr("Disconnected from %1").arg(accountNames.join(QLatin1String(", ")))); #else QStringList messages; - messages.append(tr("Disconnected from accounts:")); + // messages.append(tr("Disconnected from accounts:")); for (const auto &accountState : std::as_const(problemAccounts)) { - QString message = tr("Account %1: %2").arg(accountState->account()->displayName(), accountState->stateString(accountState->state())); + QString message = tr("Account %1: %2").arg(accountState->account()->prettyName(), accountState->stateString(accountState->state())); if (!accountState->connectionErrors().empty()) { message += QLatin1String("\n"); message += accountState->connectionErrors().join(QLatin1String("\n")); diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index 81342a629edef..0b77ef0d1e396 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -711,7 +711,11 @@ QIcon Theme::syncStateIcon(SyncResult::Status status, bool sysTray) const break; case SyncResult::SyncPrepare: case SyncResult::Success: - statusIcon = QLatin1String("state-ok"); + if (sysTray) { + statusIcon = QLatin1String("state-tray-ok"); + } else { + statusIcon = QLatin1String("state-ok"); + } break; case SyncResult::Problem: statusIcon = QLatin1String("state-warning"); diff --git a/theme.qrc.in b/theme.qrc.in index 4bf77d90807bc..2def8e6b9ece1 100644 --- a/theme.qrc.in +++ b/theme.qrc.in @@ -20,6 +20,7 @@ theme/colored/@STATE_SUBDIR@state-error-256.png theme/colored/@STATE_SUBDIR@state-ok.svg + theme/colored/state-tray-ok.svg theme/colored/@STATE_SUBDIR@state-ok-16.png theme/colored/@STATE_SUBDIR@state-ok-32.png theme/colored/@STATE_SUBDIR@state-ok-64.png @@ -63,6 +64,7 @@ theme/white/@STATE_SUBDIR@state-error-256.png theme/white/@STATE_SUBDIR@state-ok.svg + theme/white/state-tray-ok.svg theme/white/@STATE_SUBDIR@state-ok-16.png theme/white/@STATE_SUBDIR@state-ok-32.png theme/white/@STATE_SUBDIR@state-ok-64.png @@ -108,6 +110,7 @@ theme/black/@STATE_SUBDIR@state-error-256.png theme/black/@STATE_SUBDIR@state-ok.svg + theme/black/state-tray-ok.svg theme/black/@STATE_SUBDIR@state-ok-16.png theme/black/@STATE_SUBDIR@state-ok-32.png theme/black/@STATE_SUBDIR@state-ok-64.png diff --git a/theme/black/state-tray-ok.svg b/theme/black/state-tray-ok.svg new file mode 100644 index 0000000000000..1bddfed87b93f --- /dev/null +++ b/theme/black/state-tray-ok.svg @@ -0,0 +1 @@ + diff --git a/theme/colored/error.svg b/theme/colored/error.svg index b19f7689567ce..126dec76f84b5 100644 --- a/theme/colored/error.svg +++ b/theme/colored/error.svg @@ -1 +1,21 @@ - \ No newline at end of file + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme/colored/offline.svg b/theme/colored/offline.svg index f533986a8cf09..f25f49800a815 100644 --- a/theme/colored/offline.svg +++ b/theme/colored/offline.svg @@ -1 +1,40 @@ - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/theme/colored/ok.svg b/theme/colored/ok.svg index 3f1a8f2ec9e95..8034c6cea397c 100644 --- a/theme/colored/ok.svg +++ b/theme/colored/ok.svg @@ -1 +1,19 @@ - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/theme/colored/pause.svg b/theme/colored/pause.svg index 65634cf091e77..84edccbbabb02 100644 --- a/theme/colored/pause.svg +++ b/theme/colored/pause.svg @@ -1 +1,23 @@ - \ No newline at end of file + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme/colored/state-error.svg b/theme/colored/state-error.svg index b19f7689567ce..126dec76f84b5 100644 --- a/theme/colored/state-error.svg +++ b/theme/colored/state-error.svg @@ -1 +1,21 @@ - \ No newline at end of file + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme/colored/state-offline.svg b/theme/colored/state-offline.svg index f533986a8cf09..3779c91f6e935 100644 --- a/theme/colored/state-offline.svg +++ b/theme/colored/state-offline.svg @@ -1 +1,9 @@ - \ No newline at end of file + + + + + + + + + diff --git a/theme/colored/state-ok.svg b/theme/colored/state-ok.svg index 3f1a8f2ec9e95..8034c6cea397c 100644 --- a/theme/colored/state-ok.svg +++ b/theme/colored/state-ok.svg @@ -1 +1,19 @@ - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/theme/colored/state-pause.svg b/theme/colored/state-pause.svg index 65634cf091e77..84edccbbabb02 100644 --- a/theme/colored/state-pause.svg +++ b/theme/colored/state-pause.svg @@ -1 +1,23 @@ - \ No newline at end of file + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme/colored/state-sync.svg b/theme/colored/state-sync.svg index c56831a833555..1ebedd5593586 100644 --- a/theme/colored/state-sync.svg +++ b/theme/colored/state-sync.svg @@ -1 +1,21 @@ - \ No newline at end of file + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme/colored/state-tray-ok.svg b/theme/colored/state-tray-ok.svg new file mode 100644 index 0000000000000..83d0382161eba --- /dev/null +++ b/theme/colored/state-tray-ok.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/theme/colored/state-warning.svg b/theme/colored/state-warning.svg index 57b24ffbf4f26..dd5a4d7bae45b 100644 --- a/theme/colored/state-warning.svg +++ b/theme/colored/state-warning.svg @@ -1 +1,18 @@ - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/theme/colored/sync.svg b/theme/colored/sync.svg index c56831a833555..1ebedd5593586 100644 --- a/theme/colored/sync.svg +++ b/theme/colored/sync.svg @@ -1 +1,21 @@ - \ No newline at end of file + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme/colored/warning.svg b/theme/colored/warning.svg index 57b24ffbf4f26..dd5a4d7bae45b 100644 --- a/theme/colored/warning.svg +++ b/theme/colored/warning.svg @@ -1 +1,18 @@ - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/theme/white/state-tray-ok.svg b/theme/white/state-tray-ok.svg new file mode 100644 index 0000000000000..f5fc8d133c485 --- /dev/null +++ b/theme/white/state-tray-ok.svg @@ -0,0 +1 @@ + diff --git a/translations/client_de.ts b/translations/client_de.ts index 0b4417654c6b4..b3b1c4db6b026 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -5992,7 +5992,7 @@ Server antwortete mit Fehler: %2 Account synchronization is disabled - Konto-Synchronisierung ist deaktiviert + Synchronisierung pausiert