summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-09-25 02:09:22 (UTC)
committer zautrix <zautrix>2005-09-25 02:09:22 (UTC)
commit3bbc14431e854bc3d8870b5ba12d64f6e1af6eb6 (patch) (side-by-side diff)
tree0d88d48dc1b9198c9c2deed6b55c70deffcfeadd
parent181bc87d92ecc48cb07c288cb2d135d8fde56716 (diff)
downloadkdepimpi-3bbc14431e854bc3d8870b5ba12d64f6e1af6eb6.zip
kdepimpi-3bbc14431e854bc3d8870b5ba12d64f6e1af6eb6.tar.gz
kdepimpi-3bbc14431e854bc3d8870b5ba12d64f6e1af6eb6.tar.bz2
todo timer fix
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/main.cpp3
-rw-r--r--korganizer/mainwindow.cpp15
-rw-r--r--libkcal/todo.cpp12
3 files changed, 26 insertions, 4 deletions
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index a96f7c2..9410c6a 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -106,4 +106,7 @@ int main( int argc, char **argv )
}
+#ifndef DESKTOP_VERSION
+ QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable );
+#endif
a.exec();
dumpMissing();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index d1e369c..05e5087 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -27,5 +27,5 @@
#include <qtopia/alarmserver.h>
#include <qtopia/qcopenvelope_qws.h>
-#include <unistd.h> // for sleep
+//#include <unistd.h> // for sleep
#else
#include <qtoolbar.h>
@@ -2046,5 +2046,4 @@ void MainWindow::save()
}
}
-
if ( mView->viewManager()->journalView() )
mView->viewManager()->journalView()->checkModified();
@@ -2057,4 +2056,7 @@ void MainWindow::save()
return;
}
+#ifndef DESKTOP_VERSION
+ QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable );
+#endif
mSaveDelay = 0;
mSyncManager->setBlockSave(true);
@@ -2089,4 +2091,7 @@ void MainWindow::save()
}
mSyncManager->setBlockSave( false );
+#ifndef DESKTOP_VERSION
+ QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable );
+#endif
}
@@ -2507,6 +2512,12 @@ void MainWindow::saveCalendar()
KPimGlobalPrefs::instance()->mBackupEnabled = false;
save();
+#ifndef DESKTOP_VERSION
+ QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable );
+#endif
KPimGlobalPrefs::instance()->mBackupEnabled = enabled;
backupAllFiles();
+#ifndef DESKTOP_VERSION
+ QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable );
+#endif
}
void MainWindow::loadCalendar()
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index f7d40ad..70a7711 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -30,4 +30,8 @@
#include "todo.h"
+#ifndef DESKTOP_VERSION
+#include <qpe/qpeapplication.h>
+#endif
+
#define SAVETIMER_TIMEOUT_SECONDS 300
//#define SAVETIMER_TIMEOUT_SECONDS 8
@@ -140,5 +144,4 @@ void Todo::timerSlotSaveRunningInfoToFile()
restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS );
return;
-
}
restartSaveTimer( SAVETIMER_TIMEOUT_SECONDS );
@@ -152,4 +155,7 @@ void Todo::saveRunningInfoToFile()
void Todo::saveRunningInfoToFile( QString comment )
{
+#ifndef DESKTOP_VERSION
+ QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable );
+#endif
//qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1());
if ( mRunStart.secsTo ( mRunEnd) < 15 ) {
@@ -185,5 +191,7 @@ void Todo::saveRunningInfoToFile( QString comment )
format.save( &cal, file );
saveParents();
-
+#ifndef DESKTOP_VERSION
+ QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable );
+#endif
}
void Todo::saveParents()