-rw-r--r-- | korganizer/main.cpp | 3 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 15 | ||||
-rw-r--r-- | libkcal/todo.cpp | 12 |
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 ) | |||
106 | } | 106 | } |
107 | 107 | ||
108 | #ifndef DESKTOP_VERSION | ||
109 | QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable ); | ||
110 | #endif | ||
108 | a.exec(); | 111 | a.exec(); |
109 | dumpMissing(); | 112 | 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 @@ | |||
27 | #include <qtopia/alarmserver.h> | 27 | #include <qtopia/alarmserver.h> |
28 | #include <qtopia/qcopenvelope_qws.h> | 28 | #include <qtopia/qcopenvelope_qws.h> |
29 | #include <unistd.h> // for sleep | 29 | //#include <unistd.h> // for sleep |
30 | #else | 30 | #else |
31 | #include <qtoolbar.h> | 31 | #include <qtoolbar.h> |
@@ -2046,5 +2046,4 @@ void MainWindow::save() | |||
2046 | } | 2046 | } |
2047 | } | 2047 | } |
2048 | |||
2049 | if ( mView->viewManager()->journalView() ) | 2048 | if ( mView->viewManager()->journalView() ) |
2050 | mView->viewManager()->journalView()->checkModified(); | 2049 | mView->viewManager()->journalView()->checkModified(); |
@@ -2057,4 +2056,7 @@ void MainWindow::save() | |||
2057 | return; | 2056 | return; |
2058 | } | 2057 | } |
2058 | #ifndef DESKTOP_VERSION | ||
2059 | QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable ); | ||
2060 | #endif | ||
2059 | mSaveDelay = 0; | 2061 | mSaveDelay = 0; |
2060 | mSyncManager->setBlockSave(true); | 2062 | mSyncManager->setBlockSave(true); |
@@ -2089,4 +2091,7 @@ void MainWindow::save() | |||
2089 | } | 2091 | } |
2090 | mSyncManager->setBlockSave( false ); | 2092 | mSyncManager->setBlockSave( false ); |
2093 | #ifndef DESKTOP_VERSION | ||
2094 | QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable ); | ||
2095 | #endif | ||
2091 | } | 2096 | } |
2092 | 2097 | ||
@@ -2507,6 +2512,12 @@ void MainWindow::saveCalendar() | |||
2507 | KPimGlobalPrefs::instance()->mBackupEnabled = false; | 2512 | KPimGlobalPrefs::instance()->mBackupEnabled = false; |
2508 | save(); | 2513 | save(); |
2514 | #ifndef DESKTOP_VERSION | ||
2515 | QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable ); | ||
2516 | #endif | ||
2509 | KPimGlobalPrefs::instance()->mBackupEnabled = enabled; | 2517 | KPimGlobalPrefs::instance()->mBackupEnabled = enabled; |
2510 | backupAllFiles(); | 2518 | backupAllFiles(); |
2519 | #ifndef DESKTOP_VERSION | ||
2520 | QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable ); | ||
2521 | #endif | ||
2511 | } | 2522 | } |
2512 | void MainWindow::loadCalendar() | 2523 | 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 @@ | |||
30 | #include "todo.h" | 30 | #include "todo.h" |
31 | 31 | ||
32 | #ifndef DESKTOP_VERSION | ||
33 | #include <qpe/qpeapplication.h> | ||
34 | #endif | ||
35 | |||
32 | #define SAVETIMER_TIMEOUT_SECONDS 300 | 36 | #define SAVETIMER_TIMEOUT_SECONDS 300 |
33 | //#define SAVETIMER_TIMEOUT_SECONDS 8 | 37 | //#define SAVETIMER_TIMEOUT_SECONDS 8 |
@@ -140,5 +144,4 @@ void Todo::timerSlotSaveRunningInfoToFile() | |||
140 | restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS ); | 144 | restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS ); |
141 | return; | 145 | return; |
142 | |||
143 | } | 146 | } |
144 | restartSaveTimer( SAVETIMER_TIMEOUT_SECONDS ); | 147 | restartSaveTimer( SAVETIMER_TIMEOUT_SECONDS ); |
@@ -152,4 +155,7 @@ void Todo::saveRunningInfoToFile() | |||
152 | void Todo::saveRunningInfoToFile( QString comment ) | 155 | void Todo::saveRunningInfoToFile( QString comment ) |
153 | { | 156 | { |
157 | #ifndef DESKTOP_VERSION | ||
158 | QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable ); | ||
159 | #endif | ||
154 | //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); | 160 | //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1()); |
155 | if ( mRunStart.secsTo ( mRunEnd) < 15 ) { | 161 | if ( mRunStart.secsTo ( mRunEnd) < 15 ) { |
@@ -185,5 +191,7 @@ void Todo::saveRunningInfoToFile( QString comment ) | |||
185 | format.save( &cal, file ); | 191 | format.save( &cal, file ); |
186 | saveParents(); | 192 | saveParents(); |
187 | 193 | #ifndef DESKTOP_VERSION | |
194 | QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable ); | ||
195 | #endif | ||
188 | } | 196 | } |
189 | void Todo::saveParents() | 197 | void Todo::saveParents() |