From 56086b44e576087b25cdc664824fa03dfa12810d Mon Sep 17 00:00:00 2001 From: memurats Date: Fri, 24 Oct 2025 16:05:14 +0200 Subject: [PATCH 1/4] tray icon changes --- src/gui/owncloudgui.cpp | 4 ++-- src/libsync/theme.cpp | 6 +++++- theme.qrc.in | 3 +++ theme/black/state-tray-ok.svg | 1 + theme/colored/state-error.svg | 22 +++++++++++++++++++++- theme/colored/state-offline.svg | 10 +++++++++- theme/colored/state-ok.svg | 20 +++++++++++++++++++- theme/colored/state-pause.svg | 24 +++++++++++++++++++++++- theme/colored/state-sync.svg | 22 +++++++++++++++++++++- theme/colored/state-tray-ok.svg | 7 +++++++ theme/colored/state-warning.svg | 19 ++++++++++++++++++- theme/white/state-tray-ok.svg | 1 + translations/client_de.ts | 2 +- 13 files changed, 131 insertions(+), 10 deletions(-) create mode 100644 theme/black/state-tray-ok.svg create mode 100644 theme/colored/state-tray-ok.svg create mode 100644 theme/white/state-tray-ok.svg diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 1fcda11fb55b9..e5c30b9d36e71 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -396,9 +396,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 830554b98ee4c..dff6ed00cf855 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -720,7 +720,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 f3c3259bc455d..f8016011f23b5 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/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/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 6d3b231dff68a..3be7c4a3cab7d 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -6332,7 +6332,7 @@ Server antwortete mit Fehler: %2 Account synchronization is disabled - Konto-Synchronisierung ist deaktiviert + Synchronisierung pausiert From 3ffa5a617aca4edc4e01f8e43ba76bf7dcd40ceb Mon Sep 17 00:00:00 2001 From: Mauro Mura Date: Wed, 17 Jun 2026 15:33:39 +0200 Subject: [PATCH 2/4] Restore state-tray-ok.svg entries in theme.qrc.in Re-add state-tray-ok.svg files for colored, white, and black themes. --- theme.qrc.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/theme.qrc.in b/theme.qrc.in index f8016011f23b5..3b882df807892 100644 --- a/theme.qrc.in +++ b/theme.qrc.in @@ -20,7 +20,6 @@ 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 @@ -64,7 +63,6 @@ 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 @@ -110,7 +108,6 @@ 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 @@ -303,5 +300,9 @@ theme/file-open.svg theme/backup.svg theme/convert_to_text.svg + + theme/colored/state-tray-ok.svg + theme/white/state-tray-ok.svg + theme/black/state-tray-ok.svg From 056bec154a389ff2098cef2e84a3ab800f776f9e Mon Sep 17 00:00:00 2001 From: Mauro Mura Date: Wed, 17 Jun 2026 15:49:13 +0200 Subject: [PATCH 3/4] Add comment for NMC CTI icons in theme.qrc.in Added comment for NMC CTI icons section. --- theme.qrc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme.qrc.in b/theme.qrc.in index 3b882df807892..9c28a34da7a4f 100644 --- a/theme.qrc.in +++ b/theme.qrc.in @@ -300,7 +300,7 @@ theme/file-open.svg theme/backup.svg theme/convert_to_text.svg - + theme/colored/state-tray-ok.svg theme/white/state-tray-ok.svg theme/black/state-tray-ok.svg From 7664ceed1d38e4df69433020b0a7cb7bcca16cb2 Mon Sep 17 00:00:00 2001 From: Mauro Mura Date: Thu, 18 Jun 2026 15:30:03 +0200 Subject: [PATCH 4/4] Update theme.qrc.in --- theme.qrc.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/theme.qrc.in b/theme.qrc.in index 9c28a34da7a4f..1d9c4473e294b 100644 --- a/theme.qrc.in +++ b/theme.qrc.in @@ -146,6 +146,11 @@ + + theme/colored/state-tray-ok.svg + theme/white/state-tray-ok.svg + theme/black/state-tray-ok.svg + theme/colored/wizard_logo.png theme/colored/wizard_logo@2x.png @@ -300,9 +305,5 @@ theme/file-open.svg theme/backup.svg theme/convert_to_text.svg - - theme/colored/state-tray-ok.svg - theme/white/state-tray-ok.svg - theme/black/state-tray-ok.svg