Skip to content

Commit ac657ed

Browse files
committed
tray icon changes
1 parent 5c1f604 commit ac657ed

File tree

13 files changed

+131
-10
lines changed

13 files changed

+131
-10
lines changed

src/gui/owncloudgui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,9 +362,9 @@ void ownCloudGui::slotComputeOverallSyncStatus()
362362
_tray->setToolTip(tr("Disconnected from %1").arg(accountNames.join(QLatin1String(", "))));
363363
#else
364364
QStringList messages;
365-
messages.append(tr("Disconnected from accounts:"));
365+
// messages.append(tr("Disconnected from accounts:"));
366366
for (const auto &accountState : std::as_const(problemAccounts)) {
367-
QString message = tr("Account %1: %2").arg(accountState->account()->displayName(), accountState->stateString(accountState->state()));
367+
QString message = tr("Account %1: %2").arg(accountState->account()->prettyName(), accountState->stateString(accountState->state()));
368368
if (!accountState->connectionErrors().empty()) {
369369
message += QLatin1String("\n");
370370
message += accountState->connectionErrors().join(QLatin1String("\n"));

src/libsync/theme.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,11 @@ QIcon Theme::syncStateIcon(SyncResult::Status status, bool sysTray) const
711711
break;
712712
case SyncResult::SyncPrepare:
713713
case SyncResult::Success:
714-
statusIcon = QLatin1String("state-ok");
714+
if (sysTray) {
715+
statusIcon = QLatin1String("state-tray-ok");
716+
} else {
717+
statusIcon = QLatin1String("state-ok");
718+
}
715719
break;
716720
case SyncResult::Problem:
717721
statusIcon = QLatin1String("state-warning");

theme.qrc.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<file alias="theme/colored/state-error-256.png">theme/colored/@STATE_SUBDIR@state-error-256.png</file>
2121

2222
<file alias="theme/colored/state-ok.svg">theme/colored/@STATE_SUBDIR@state-ok.svg</file>
23+
<file alias="theme/colored/state-tray-ok.svg">theme/colored/state-tray-ok.svg</file>
2324
<file alias="theme/colored/state-ok-16.png">theme/colored/@STATE_SUBDIR@state-ok-16.png</file>
2425
<file alias="theme/colored/state-ok-32.png">theme/colored/@STATE_SUBDIR@state-ok-32.png</file>
2526
<file alias="theme/colored/state-ok-64.png">theme/colored/@STATE_SUBDIR@state-ok-64.png</file>
@@ -63,6 +64,7 @@
6364
<file alias="theme/white/state-error-256.png">theme/white/@STATE_SUBDIR@state-error-256.png</file>
6465

6566
<file alias="theme/white/state-ok.svg">theme/white/@STATE_SUBDIR@state-ok.svg</file>
67+
<file alias="theme/white/state-tray-ok.svg">theme/white/state-tray-ok.svg</file>
6668
<file alias="theme/white/state-ok-16.png">theme/white/@STATE_SUBDIR@state-ok-16.png</file>
6769
<file alias="theme/white/state-ok-32.png">theme/white/@STATE_SUBDIR@state-ok-32.png</file>
6870
<file alias="theme/white/state-ok-64.png">theme/white/@STATE_SUBDIR@state-ok-64.png</file>
@@ -108,6 +110,7 @@
108110
<file alias="theme/black/state-error-256.png">theme/black/@STATE_SUBDIR@state-error-256.png</file>
109111

110112
<file alias="theme/black/state-ok.svg">theme/black/@STATE_SUBDIR@state-ok.svg</file>
113+
<file alias="theme/black/state-tray-ok.svg">theme/black/state-tray-ok.svg</file>
111114
<file alias="theme/black/state-ok-16.png">theme/black/@STATE_SUBDIR@state-ok-16.png</file>
112115
<file alias="theme/black/state-ok-32.png">theme/black/@STATE_SUBDIR@state-ok-32.png</file>
113116
<file alias="theme/black/state-ok-64.png">theme/black/@STATE_SUBDIR@state-ok-64.png</file>

theme/black/state-tray-ok.svg

Lines changed: 1 addition & 0 deletions
Loading

theme/colored/state-error.svg

Lines changed: 21 additions & 1 deletion
Loading

theme/colored/state-offline.svg

Lines changed: 9 additions & 1 deletion
Loading

theme/colored/state-ok.svg

Lines changed: 19 additions & 1 deletion
Loading

theme/colored/state-pause.svg

Lines changed: 23 additions & 1 deletion
Loading

theme/colored/state-sync.svg

Lines changed: 21 additions & 1 deletion
Loading

theme/colored/state-tray-ok.svg

Lines changed: 7 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)