[Pkg-owncloud-commits] [owncloud-client] 123/219: Updater: Add "didn't check for updates" message. #2175

[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 30683b38a883a68bda1835dc8c3eaaf9fcc67957
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Wed Sep 17 11:41:04 2014 +0200

    Updater: Add "didn't check for updates" message. #2175
    
    Don't show "Checking server..." when we are not.
    
    (cherry picked from commit ece11dc3d8c906dddf45987cb636e725c5a138fa)
---
 src/updater/ocupdater.cpp | 6 +++++-
 src/updater/ocupdater.h   | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/updater/ocupdater.cpp b/src/updater/ocupdater.cpp
index e4ed907..5dbf224 100644
--- a/src/updater/ocupdater.cpp
+++ b/src/updater/ocupdater.cpp
@@ -83,8 +83,10 @@ QString OCUpdater::statusString() const
         return tr("Could not check for new updates.");
     case UpdateOnlyAvailableThroughSystem:
         return tr("New version %1 available. Please use the system's update tool to install it.").arg(updateVersion);
-    case Unknown:
+    case CheckingServer:
         return tr("Checking update server...");
+    case Unknown:
+        return tr("Update status is unknown: Did not check for new updates.");
     case UpToDate:
         // fall through
     default:
@@ -120,6 +122,8 @@ void OCUpdater::checkForUpdate()
     connect(_timer, SIGNAL(timeout()), this, SLOT(slotTimedOut()));
     _timer->start(30*1000);
     connect(reply, SIGNAL(finished()), this, SLOT(slotVersionInfoArrived()));
+
+    setDownloadState(CheckingServer);
 }
 
 void OCUpdater::slotOpenUpdateUrl()
diff --git a/src/updater/ocupdater.h b/src/updater/ocupdater.h
index 1041517..3201e7c 100644
--- a/src/updater/ocupdater.h
+++ b/src/updater/ocupdater.h
@@ -33,7 +33,8 @@ class OCUpdater : public QObject, public Updater
 {
     Q_OBJECT
 public:
-    enum DownloadState { Unknown = 0, UpToDate, Downloading, DownloadComplete,
+    enum DownloadState { Unknown = 0, CheckingServer, UpToDate,
+                         Downloading, DownloadComplete,
                          DownloadFailed, DownloadTimedOut,
                          UpdateOnlyAvailableThroughSystem };
     explicit OCUpdater(const QUrl &url, QObject *parent = 0);

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