-rw-r--r-- | korganizer/main.cpp | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/korganizer/main.cpp b/korganizer/main.cpp index 9410c6a..4a0e24f 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp | |||
@@ -101,17 +101,17 @@ int main( int argc, char **argv ) | |||
101 | QCString command = argv[1]; | 101 | QCString command = argv[1]; |
102 | if ( argc > 2 ) | 102 | if ( argc > 2 ) |
103 | command += argv[2]; | 103 | command += argv[2]; |
104 | m.recieve(command, QByteArray() ); | 104 | m.recieve(command, QByteArray() ); |
105 | 105 | ||
106 | } | 106 | } |
107 | 107 | ||
108 | #ifndef DESKTOP_VERSION | 108 | #ifndef DESKTOP_VERSION |
109 | QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable ); | 109 | // QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable ); |
110 | #endif | 110 | #endif |
111 | a.exec(); | 111 | a.exec(); |
112 | dumpMissing(); | 112 | dumpMissing(); |
113 | 113 | ||
114 | KPimGlobalPrefs::instance()->writeConfig(); | 114 | KPimGlobalPrefs::instance()->writeConfig(); |
115 | } | 115 | } |
116 | qDebug("KO: Bye! "); | 116 | qDebug("KO: Bye! "); |
117 | } | 117 | } |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 05e5087..c597138 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -2051,17 +2051,17 @@ void MainWindow::save() | |||
2051 | qDebug("KO: Calendar not modified. Nothing saved."); | 2051 | qDebug("KO: Calendar not modified. Nothing saved."); |
2052 | return; | 2052 | return; |
2053 | } | 2053 | } |
2054 | if ( mSyncManager->blockSave() ) { | 2054 | if ( mSyncManager->blockSave() ) { |
2055 | slotModifiedChanged( true ); | 2055 | slotModifiedChanged( true ); |
2056 | return; | 2056 | return; |
2057 | } | 2057 | } |
2058 | #ifndef DESKTOP_VERSION | 2058 | #ifndef DESKTOP_VERSION |
2059 | QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable ); | 2059 | // QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable ); |
2060 | #endif | 2060 | #endif |
2061 | mSaveDelay = 0; | 2061 | mSaveDelay = 0; |
2062 | mSyncManager->setBlockSave(true); | 2062 | mSyncManager->setBlockSave(true); |
2063 | if ( mView->checkAllFileVersions() ) { | 2063 | if ( mView->checkAllFileVersions() ) { |
2064 | if ( KPimGlobalPrefs::instance()->mBackupEnabled ){ | 2064 | if ( KPimGlobalPrefs::instance()->mBackupEnabled ){ |
2065 | QDate reference ( 2000,1,1); | 2065 | QDate reference ( 2000,1,1); |
2066 | int daysTo = reference.daysTo ( QDate::currentDate() ); | 2066 | int daysTo = reference.daysTo ( QDate::currentDate() ); |
2067 | if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) { | 2067 | if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) { |
@@ -2086,17 +2086,17 @@ void MainWindow::save() | |||
2086 | qDebug(savemes); | 2086 | qDebug(savemes); |
2087 | } else { | 2087 | } else { |
2088 | setCaption(i18n("Saving cancelled!")); | 2088 | setCaption(i18n("Saving cancelled!")); |
2089 | mCalendarModifiedFlag = false; | 2089 | mCalendarModifiedFlag = false; |
2090 | slotModifiedChanged( true ); | 2090 | slotModifiedChanged( true ); |
2091 | } | 2091 | } |
2092 | mSyncManager->setBlockSave( false ); | 2092 | mSyncManager->setBlockSave( false ); |
2093 | #ifndef DESKTOP_VERSION | 2093 | #ifndef DESKTOP_VERSION |
2094 | QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable ); | 2094 | //QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable ); |
2095 | #endif | 2095 | #endif |
2096 | } | 2096 | } |
2097 | 2097 | ||
2098 | void MainWindow::keyReleaseEvent ( QKeyEvent * e) | 2098 | void MainWindow::keyReleaseEvent ( QKeyEvent * e) |
2099 | { | 2099 | { |
2100 | if ( !e->isAutoRepeat() ) { | 2100 | if ( !e->isAutoRepeat() ) { |
2101 | mFlagKeyPressed = false; | 2101 | mFlagKeyPressed = false; |
2102 | } | 2102 | } |
@@ -2507,22 +2507,22 @@ void MainWindow::saveCalendar() | |||
2507 | QString bupHint; | 2507 | QString bupHint; |
2508 | if ( !KPimGlobalPrefs::instance()->mBackupEnabled ) | 2508 | if ( !KPimGlobalPrefs::instance()->mBackupEnabled ) |
2509 | bupHint = i18n("(Hint: You can enable automatic backup in the global settings!)"); | 2509 | bupHint = i18n("(Hint: You can enable automatic backup in the global settings!)"); |
2510 | 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; | 2510 | 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; |
2511 | bool enabled = KPimGlobalPrefs::instance()->mBackupEnabled; | 2511 | bool enabled = KPimGlobalPrefs::instance()->mBackupEnabled; |
2512 | KPimGlobalPrefs::instance()->mBackupEnabled = false; | 2512 | KPimGlobalPrefs::instance()->mBackupEnabled = false; |
2513 | save(); | 2513 | save(); |
2514 | #ifndef DESKTOP_VERSION | 2514 | #ifndef DESKTOP_VERSION |
2515 | QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable ); | 2515 | //QPEApplication::setTempScreenSaverMode ( QPEApplication::Disable ); |
2516 | #endif | 2516 | #endif |
2517 | KPimGlobalPrefs::instance()->mBackupEnabled = enabled; | 2517 | KPimGlobalPrefs::instance()->mBackupEnabled = enabled; |
2518 | backupAllFiles(); | 2518 | backupAllFiles(); |
2519 | #ifndef DESKTOP_VERSION | 2519 | #ifndef DESKTOP_VERSION |
2520 | QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable ); | 2520 | //QPEApplication::setTempScreenSaverMode ( QPEApplication::Enable ); |
2521 | #endif | 2521 | #endif |
2522 | } | 2522 | } |
2523 | void MainWindow::loadCalendar() | 2523 | void MainWindow::loadCalendar() |
2524 | { | 2524 | { |
2525 | 2525 | ||
2526 | 2526 | ||
2527 | #if 0 | 2527 | #if 0 |
2528 | QString fn = KOPrefs::instance()->mLastLoadFile; | 2528 | QString fn = KOPrefs::instance()->mLastLoadFile; |