[master] 2055-Custom_Tray_Icon

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"));

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");

theme.qrc.in

@@ -20,6 +20,7 @@
 		<file alias="theme/colored/state-error-256.png">theme/colored/@[email protected]</file>
 
 		<file alias="theme/colored/state-ok.svg">theme/colored/@[email protected]</file>
+        <file alias="theme/colored/state-tray-ok.svg">theme/colored/state-tray-ok.svg</file>
 		<file alias="theme/colored/state-ok-16.png">theme/colored/@[email protected]</file>
 		<file alias="theme/colored/state-ok-32.png">theme/colored/@[email protected]</file>
 		<file alias="theme/colored/state-ok-64.png">theme/colored/@[email protected]</file>
@@ -63,6 +64,7 @@
 		<file alias="theme/white/state-error-256.png">theme/white/@[email protected]</file>
 
 		<file alias="theme/white/state-ok.svg">theme/white/@[email protected]</file>
+        <file alias="theme/white/state-tray-ok.svg">theme/white/state-tray-ok.svg</file>
 		<file alias="theme/white/state-ok-16.png">theme/white/@[email protected]</file>
 		<file alias="theme/white/state-ok-32.png">theme/white/@[email protected]</file>
 		<file alias="theme/white/state-ok-64.png">theme/white/@[email protected]</file>
@@ -108,6 +110,7 @@
 		<file alias="theme/black/state-error-256.png">theme/black/@[email protected]</file>
 
 		<file alias="theme/black/state-ok.svg">theme/black/@[email protected]</file>
+        <file alias="theme/black/state-tray-ok.svg">theme/black/state-tray-ok.svg</file>
 		<file alias="theme/black/state-ok-16.png">theme/black/@[email protected]</file>
 		<file alias="theme/black/state-ok-32.png">theme/black/@[email protected]</file>
 		<file alias="theme/black/state-ok-64.png">theme/black/@[email protected]</file>