[Pkg-owncloud-commits] [owncloud-client] 84/115: Status Icon: Set a proper icon if no sync is configured.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit d02175210bc8e6088e77f4f9989fe0428888b0c3
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Aug 19 17:46:47 2014 +0200

    Status Icon: Set a proper icon if no sync is configured.
    
    This fixes bug #1956
---
 src/mirall/owncloudgui.cpp  | 8 ++++++++
 src/mirall/settingsdialog.h | 2 +-
 src/mirall/theme.cpp        | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp
index a46b31d..7e9e710 100644
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@ -266,6 +266,14 @@ void ownCloudGui::slotComputeOverallSyncStatus()
             QIcon statusIcon = Theme::instance()->syncStateIcon( overallResult.status(), true);
             _tray->setIcon( statusIcon );
             _tray->setToolTip(trayMessage);
+        } else {
+            // undefined because there are no folders.
+            QIcon icon = Theme::instance()->syncStateIcon(SyncResult::Problem);
+            _tray->setIcon( icon );
+            _tray->setToolTip(tr("There are no sync folders configured."));
+            if( _settingsDialog ) {
+                _settingsDialog->slotUpdateAccountIcon(icon);
+            }
         }
     }
 }
diff --git a/src/mirall/settingsdialog.h b/src/mirall/settingsdialog.h
index 1e60f6d..f5ce4db 100644
--- a/src/mirall/settingsdialog.h
+++ b/src/mirall/settingsdialog.h
@@ -46,13 +46,13 @@ public:
 
 public slots:
     void showActivityPage();
+    void slotUpdateAccountIcon(const QIcon& icon);
 
 protected:
     void reject() Q_DECL_OVERRIDE;
     void accept() Q_DECL_OVERRIDE;
 
 private slots:
-    void slotUpdateAccountIcon(const QIcon& icon);
 
 private:
     Ui::SettingsDialog *_ui;
diff --git a/src/mirall/theme.cpp b/src/mirall/theme.cpp
index d6f3321..94bead6 100644
--- a/src/mirall/theme.cpp
+++ b/src/mirall/theme.cpp
@@ -282,6 +282,9 @@ QIcon Theme::syncStateIcon( SyncResult::Status status, bool sysTray ) const
 
     switch( status ) {
     case SyncResult::Undefined:
+        // this can happen if no sync connections are configured.
+        statusIcon = QLatin1String("state-information");
+        break;
     case SyncResult::NotYetStarted:
     case SyncResult::SyncRunning:
         statusIcon = QLatin1String("state-sync");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git