author | zautrix <zautrix> | 2005-09-25 01:27:36 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-09-25 01:27:36 (UTC) |
commit | 181bc87d92ecc48cb07c288cb2d135d8fde56716 (patch) (unidiff) | |
tree | 97d972b99fc1a147cdbb0b9a295527e6d6fe119c /libkcal | |
parent | bd991f0a33d85385735ed4911b794b8740e4d296 (diff) | |
download | kdepimpi-181bc87d92ecc48cb07c288cb2d135d8fde56716.zip kdepimpi-181bc87d92ecc48cb07c288cb2d135d8fde56716.tar.gz kdepimpi-181bc87d92ecc48cb07c288cb2d135d8fde56716.tar.bz2 |
todo timer fix
-rw-r--r-- | libkcal/todo.cpp | 32 | ||||
-rw-r--r-- | libkcal/todo.h | 1 |
2 files changed, 23 insertions, 10 deletions
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index de07496..f7d40ad 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -99,6 +99,4 @@ void Todo::setRunning( bool run ) | |||
99 | if ( mRunning ) { | 99 | if ( mRunning ) { |
100 | mRunSaveTimer->start( SAVETIMER_TIMEOUT_SECONDS * 1000 ); // 5 min | 100 | restartSaveTimer( SAVETIMER_TIMEOUT_SECONDS ); |
101 | mRunStart = QDateTime::currentDateTime(); | 101 | mRunStart = QDateTime::currentDateTime(); |
102 | mRunLastSave = QDateTime::currentDateTime(); | ||
103 | mCurrentTimerDelay = SAVETIMER_TIMEOUT_SECONDS; | ||
104 | } else { | 102 | } else { |
@@ -116,2 +114,8 @@ void Todo::saveRunningInfo( QString comment, QDateTime start, QDateTime end ) | |||
116 | } | 114 | } |
115 | void Todo::restartSaveTimer( int secs ) | ||
116 | { | ||
117 | mRunSaveTimer->start( secs * 1000 ); | ||
118 | mRunLastSave = QDateTime::currentDateTime(); | ||
119 | mCurrentTimerDelay = secs; | ||
120 | } | ||
117 | void Todo::timerSlotSaveRunningInfoToFile() | 121 | void Todo::timerSlotSaveRunningInfoToFile() |
@@ -120,3 +124,3 @@ void Todo::timerSlotSaveRunningInfoToFile() | |||
120 | int secsTo = mRunLastSave.secsTo( mRunEnd ); | 124 | int secsTo = mRunLastSave.secsTo( mRunEnd ); |
121 | if( secsTo == 8 ) ++secsTo; | 125 | //if( secsTo == 8 ) ++secsTo; |
122 | qDebug("KO Todo::saveTimerTimeout %d %d", secsTo, mCurrentTimerDelay ); | 126 | qDebug("KO Todo::saveTimerTimeout %d %d", secsTo, mCurrentTimerDelay ); |
@@ -124,10 +128,18 @@ void Todo::timerSlotSaveRunningInfoToFile() | |||
124 | qDebug("KO Todo::saveTimerTimeout restart %d ", SAVETIMER_TIMEOUT_RETRY_SECONDS ); | 128 | qDebug("KO Todo::saveTimerTimeout restart %d ", SAVETIMER_TIMEOUT_RETRY_SECONDS ); |
125 | mRunSaveTimer->start( SAVETIMER_TIMEOUT_RETRY_SECONDS * 1000 ); | 129 | restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS ); |
126 | mRunLastSave = QDateTime::currentDateTime(); | ||
127 | mCurrentTimerDelay = SAVETIMER_TIMEOUT_RETRY_SECONDS; | ||
128 | return; | 130 | return; |
129 | } | 131 | } |
130 | mRunSaveTimer->start( SAVETIMER_TIMEOUT_SECONDS * 1000 ); // 5 min | 132 | int msecs = mRunLastSave.time().msecsTo( mRunEnd.time()); |
131 | mRunLastSave = QDateTime::currentDateTime(); | 133 | if ( msecs < 0 ) { |
132 | mCurrentTimerDelay = SAVETIMER_TIMEOUT_SECONDS; | 134 | restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS ); |
135 | return; | ||
136 | } | ||
137 | // qDebug("KO Todo::saveTimerTimeout restarting! millisecs %d", msecs - ( ( mCurrentTimerDelay * 1000 ) + 50 ) ); | ||
138 | if ( msecs > ( ( mCurrentTimerDelay * 1000 ) + 50 )) { | ||
139 | qDebug("KO Todo::saveTimerTimeout restarting! millisecs %d", msecs - ( ( mCurrentTimerDelay * 1000 ) + 50 ) ); | ||
140 | restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS ); | ||
141 | return; | ||
142 | |||
143 | } | ||
144 | restartSaveTimer( SAVETIMER_TIMEOUT_SECONDS ); | ||
133 | saveRunningInfoToFile( QString::null ); | 145 | saveRunningInfoToFile( QString::null ); |
diff --git a/libkcal/todo.h b/libkcal/todo.h index e6b8a21..71b7a4e 100644 --- a/libkcal/todo.h +++ b/libkcal/todo.h | |||
@@ -136,2 +136,3 @@ namespace KCal { | |||
136 | private: | 136 | private: |
137 | void restartSaveTimer( int secs ); | ||
137 | int mCurrentTimerDelay; | 138 | int mCurrentTimerDelay; |