summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -104,8 +104,11 @@ int main( int argc, char **argv )
m.recieve(command, QByteArray() );
}
+#ifndef DESKTOP_VERSION
+ QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable );
+#endif
a.exec();
dumpMissing();
KPimGlobalPrefs::instance()->writeConfig();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index d1e369c..05e5087 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -25,9 +25,9 @@
#include <qpe/resource.h>
#include <qpe/qpeapplication.h>
#include <qtopia/alarmserver.h>
#include <qtopia/qcopenvelope_qws.h>
-#include <unistd.h> // for sleep
+//#include <unistd.h> // for sleep
#else
#include <qtoolbar.h>
#include <qapplication.h>
//#include <resource.h>
@@ -2044,9 +2044,8 @@ void MainWindow::save()
mSaveDelay = msec/1000;
return;
}
}
-
if ( mView->viewManager()->journalView() )
mView->viewManager()->journalView()->checkModified();
if ( !mCalendarModifiedFlag ) {
qDebug("KO: Calendar not modified. Nothing saved.");
@@ -2055,8 +2054,11 @@ void MainWindow::save()
if ( mSyncManager->blockSave() ) {
slotModifiedChanged( true );
return;
}
+#ifndef DESKTOP_VERSION
+ QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable );
+#endif
mSaveDelay = 0;
mSyncManager->setBlockSave(true);
if ( mView->checkAllFileVersions() ) {
if ( KPimGlobalPrefs::instance()->mBackupEnabled ){
@@ -2087,8 +2089,11 @@ void MainWindow::save()
mCalendarModifiedFlag = false;
slotModifiedChanged( true );
}
mSyncManager->setBlockSave( false );
+#ifndef DESKTOP_VERSION
+ QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable );
+#endif
}
void MainWindow::keyReleaseEvent ( QKeyEvent * e)
{
@@ -2505,10 +2510,16 @@ void MainWindow::saveCalendar()
if ( KMessageBox::warningContinueCancel( this, i18n("This will <b>backup all calendar files</b> to the directory %1 %2").arg(bupDir).arg(bupHint),i18n("Information") ) != KMessageBox::Continue ) return;
bool enabled = KPimGlobalPrefs::instance()->mBackupEnabled;
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
@@ -28,8 +28,12 @@
#include "calendarlocal.h"
#include "icalformat.h"
#include "todo.h"
+#ifndef DESKTOP_VERSION
+#include <qpe/qpeapplication.h>
+#endif
+
#define SAVETIMER_TIMEOUT_SECONDS 300
//#define SAVETIMER_TIMEOUT_SECONDS 8
#define SAVETIMER_TIMEOUT_RETRY_SECONDS 5
@@ -138,9 +142,8 @@ void Todo::timerSlotSaveRunningInfoToFile()
if ( msecs > ( ( mCurrentTimerDelay * 1000 ) + 50 )) {
qDebug("KO Todo::saveTimerTimeout restarting! millisecs %d", msecs - ( ( mCurrentTimerDelay * 1000 ) + 50 ) );
restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS );
return;
-
}
restartSaveTimer( SAVETIMER_TIMEOUT_SECONDS );
saveRunningInfoToFile( QString::null );
}
@@ -150,8 +153,11 @@ void Todo::saveRunningInfoToFile()
saveRunningInfoToFile( QString::null );
}
void Todo::saveRunningInfoToFile( QString comment )
{
+#ifndef DESKTOP_VERSION
+ QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable );
+#endif
//qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1());
if ( mRunStart.secsTo ( mRunEnd) < 15 ) {
qDebug("Running time < 15 seconds. Skipped. ");
return;
@@ -183,9 +189,11 @@ void Todo::saveRunningInfoToFile( QString comment )
ICalFormat format( false );
file = dir +"/" +file +".ics";
format.save( &cal, file );
saveParents();
-
+#ifndef DESKTOP_VERSION
+ QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable );
+#endif
}
void Todo::saveParents()
{
if (!relatedTo() )