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

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/timer
From:       Davide Bettio <davide.bettio () kdemail ! net>
Date:       2009-04-21 21:06:08
Message-ID: 1240347968.259670.29424.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 957352 by bettio:

Display seconds anyway even if they are hidden when time is running out (seconds < 60).


 M  +18 -8     timer.cpp  


--- trunk/KDE/kdeplasma-addons/applets/timer/timer.cpp #957351:957352
@@ -302,18 +302,28 @@
 
     QString suffix = (m_seconds < 60 && m_running) ? "_1" : "";
 
-    m_hoursDigit[0]->setElementID(QString::number(hours / 10) + suffix);
-    m_hoursDigit[1]->setElementID(QString::number(hours % 10) + suffix);
+    if ((m_seconds >= 60) || m_secondsDigit[0]->isVisible()){
+        m_hoursDigit[0]->setElementID(QString::number(hours / 10) + suffix);
+        m_hoursDigit[1]->setElementID(QString::number(hours % 10) + suffix);
 
-    m_separator[0]->setElementID(m_separatorBasename + suffix);
+        m_separator[0]->setElementID(m_separatorBasename + suffix);
 
-    m_minutesDigit[0]->setElementID(QString::number(mins / 10) + suffix);
-    m_minutesDigit[1]->setElementID(QString::number(mins % 10) + suffix);
+        m_minutesDigit[0]->setElementID(QString::number(mins / 10) + suffix);
+        m_minutesDigit[1]->setElementID(QString::number(mins % 10) + suffix);
 
-    m_separator[1]->setElementID(m_separatorBasename + suffix);
+        m_separator[1]->setElementID(m_separatorBasename + suffix);
 
-    m_secondsDigit[0]->setElementID(QString::number(seconds / 10) + suffix);
-    m_secondsDigit[1]->setElementID(QString::number(seconds % 10) + suffix);
+        m_secondsDigit[0]->setElementID(QString::number(seconds / 10) + suffix);
+        m_secondsDigit[1]->setElementID(QString::number(seconds % 10) + suffix);
+    }else{
+        m_hoursDigit[0]->setElementID(QString::number(hours / 10) + suffix);
+        m_hoursDigit[1]->setElementID(QString::number(hours % 10) + suffix);
+
+        m_separator[0]->setElementID(m_separatorBasename + suffix);
+
+        m_minutesDigit[0]->setElementID(QString::number(seconds / 10) + suffix);
+        m_minutesDigit[1]->setElementID(QString::number(seconds % 10) + suffix);
+    }
 }
 
 void Timer::slotCountDone()
[prev in list] [next in list] [prev in thread] [next in thread]