SVN commit 1226248 by jbaptiste:

Added postpone break statistics and
fixed skip break statistic count, it was always counting all skipped breaks as
tiny breaks.

 M  +2 -0      rsiglobals.h  
 M  +13 -0     rsistats.cpp  
 M  +4 -2      rsistatwidget.cpp  
 M  +7 -1      rsitimer.cpp  


--- trunk/extragear/utils/rsibreak/src/rsiglobals.h #1226247:1226248
@@ -42,9 +42,11 @@
     IDLENESS_CAUSED_SKIP_BIG,
     TINY_BREAKS,
     TINY_BREAKS_SKIPPED,
+    TINY_BREAKS_POSTPONED,
     LAST_TINY_BREAK,
     BIG_BREAKS,
     BIG_BREAKS_SKIPPED,
+    BIG_BREAKS_POSTPONED,
     LAST_BIG_BREAK,
     PAUSE_SCORE
 };
--- trunk/extragear/utils/rsibreak/src/rsistats.cpp #1226247:1226248
@@ -68,6 +68,8 @@
                          new RSIStatItem( i18n( "Number of skipped short breaks (user)" ) ) );
     m_statistics[TINY_BREAKS_SKIPPED]->addDerivedItem( PAUSE_SCORE );
 
+    m_statistics.insert( TINY_BREAKS_POSTPONED,
+                         new RSIStatItem( i18n( "Number of postponed short breaks (user)" ) ) );
 
     m_statistics.insert( IDLENESS_CAUSED_SKIP_TINY,
                          new RSIStatItem( i18n( "Number of skipped short breaks (idle)" ) ) );
@@ -84,6 +86,9 @@
                          new RSIStatItem( i18n( "Number of skipped long breaks (user)" ) ) );
     m_statistics[BIG_BREAKS_SKIPPED]->addDerivedItem( PAUSE_SCORE );
 
+    m_statistics.insert( BIG_BREAKS_POSTPONED,
+                         new RSIStatItem( i18n( "Number of postponed long breaks (user)" ) ) );
+
     m_statistics.insert( IDLENESS_CAUSED_SKIP_BIG,
                          new RSIStatItem( i18n( "Number of skipped long breaks (idle)" ) ) );
 
@@ -279,9 +284,11 @@
         // plain integer values
     case TINY_BREAKS:
     case TINY_BREAKS_SKIPPED:
+    case TINY_BREAKS_POSTPONED:
     case IDLENESS_CAUSED_SKIP_TINY:
     case BIG_BREAKS:
     case BIG_BREAKS_SKIPPED:
+    case BIG_BREAKS_POSTPONED:
     case IDLENESS_CAUSED_SKIP_BIG:
         l->setText( QString::number(
                         m_statistics[ stat ]->getValue().toInt() ) );
@@ -379,6 +386,9 @@
     case TINY_BREAKS_SKIPPED:
         return i18n( "This is the total number of short breaks "
                      "which you skipped." );
+    case TINY_BREAKS_POSTPONED:
+        return i18n( "This is the total number of short breaks "
+                     "which you postponed." );
     case IDLENESS_CAUSED_SKIP_TINY:
         return i18n( "This is the total number of short breaks "
                      "which were skipped because you were idle." );
@@ -391,6 +401,9 @@
     case BIG_BREAKS_SKIPPED:
         return i18n( "This is the total number of long breaks "
                      "which you skipped." );
+    case BIG_BREAKS_POSTPONED:
+        return i18n( "This is the total number of long breaks "
+                     "which you postponed." );
     case IDLENESS_CAUSED_SKIP_BIG:
         return i18n( "This is the total number of long breaks "
                      "which were skipped because you were idle." );
--- trunk/extragear/utils/rsibreak/src/rsistatwidget.cpp #1226247:1226248
@@ -49,7 +49,8 @@
     addStat( TINY_BREAKS, subgrid, 0 );
     addStat( LAST_TINY_BREAK, subgrid, 1 );
     addStat( TINY_BREAKS_SKIPPED, subgrid, 2 );
-    addStat( IDLENESS_CAUSED_SKIP_TINY, subgrid, 3 );
+    addStat( TINY_BREAKS_POSTPONED, subgrid, 3 );
+    addStat( IDLENESS_CAUSED_SKIP_TINY, subgrid, 4 );
     mGrid->addWidget( gb, 0, 1 );
 
     gb = new QGroupBox( i18n( "Pause" ), this );
@@ -66,7 +67,8 @@
     addStat( BIG_BREAKS, subgrid, 0 );
     addStat( LAST_BIG_BREAK, subgrid, 1 );
     addStat( BIG_BREAKS_SKIPPED, subgrid, 2 );
-    addStat( IDLENESS_CAUSED_SKIP_BIG, subgrid, 3 );
+    addStat( BIG_BREAKS_POSTPONED, subgrid, 3 );
+    addStat( IDLENESS_CAUSED_SKIP_BIG, subgrid, 4 );
     mGrid->addWidget( gb, 1, 1 );
 }
 
--- trunk/extragear/utils/rsibreak/src/rsitimer.cpp #1226247:1226248
@@ -218,7 +218,7 @@
 void RSITimer::skipBreak()
 {
     emit minimize();
-    if ( m_big_left <= m_tiny_left ) {
+    if ( m_big_left <= m_tiny_left + 1 ) {
         resetAfterBigBreak();
         RSIGlobals::instance()->stats()->increaseStat( BIG_BREAKS_SKIPPED );
     } else {
@@ -237,6 +237,12 @@
    m_big_left += m_intervals["postpone_break"];
    m_tiny_left += m_intervals["postpone_break"];
    
+   if ( m_big_left <= m_tiny_left + 1 ) {
+       RSIGlobals::instance()->stats()->increaseStat( BIG_BREAKS_POSTPONED );
+   } else {
+       RSIGlobals::instance()->stats()->increaseStat( TINY_BREAKS_POSTPONED );
+   }
+  
    emit relax( -1, false );
    emit updateToolTip( m_tiny_left, m_big_left );
    emit minimize();