[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/generic/applets/systemtray/ui
From:       Darío Andrés Rodríguez <andresbajotierra () gmail ! co
Date:       2009-10-31 23:30:39
Message-ID: 1257031839.367984.13508.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1043176 by darioandres:

- Small fix to my previous fix (rev. 1043127) : only show ETA and Speed if the job is running
  (Otherwise, this data will override the "Paused" message setted before.)

CCBUG: 210081
CCMAIL: aseigo@kde.org


 M  +8 -6      jobwidget.cpp  


--- trunk/KDE/kdebase/workspace/plasma/generic/applets/systemtray/ui/jobwidget.cpp #1043175:1043176
@@ -201,12 +201,14 @@
 
     m_meter->setValue(m_job->percentage());
 
-    //Update the ETA and job speed
-    if (m_job->eta()) {
-        m_eta->setText(i18n("%1 (%2 remaining)", m_job->speed(),
-                             KGlobal::locale()->formatDuration(m_job->eta())));
-    } else {
-        m_eta->setText(QString());
+    //Update the ETA and job speed (only if running)
+    if (m_job->state() == SystemTray::Job::Running) {
+        if (m_job->eta()) {
+            m_eta->setText(i18n("%1 (%2 remaining)", m_job->speed(),
+                                 KGlobal::locale()->formatDuration(m_job->eta())));
+        } else {
+            m_eta->setText(QString());
+        }
     }
 
     if (m_job->labels().count() > 0) {
[prev in list] [next in list] [prev in thread] [next in thread]