-rw-r--r-- | korganizer/mainwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 05e5087..c597138 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -2011,132 +2011,132 @@ void MainWindow::backupAllFiles() | |||
2011 | } else if ( retval == 1 ){ | 2011 | } else if ( retval == 1 ){ |
2012 | qDebug("KO: Backup created."); | 2012 | qDebug("KO: Backup created."); |
2013 | // backup ok | 2013 | // backup ok |
2014 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 2014 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
2015 | KopiCalendarFile * cal = calendars.first(); | 2015 | KopiCalendarFile * cal = calendars.first(); |
2016 | cal = calendars.next(); | 2016 | cal = calendars.next(); |
2017 | while ( cal ) { | 2017 | while ( cal ) { |
2018 | if ( !cal->mErrorOnLoad ) { | 2018 | if ( !cal->mErrorOnLoad ) { |
2019 | KApplication::createBackup( cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers ); | 2019 | KApplication::createBackup( cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers ); |
2020 | } | 2020 | } |
2021 | cal = calendars.next(); | 2021 | cal = calendars.next(); |
2022 | } | 2022 | } |
2023 | KOPrefs::instance()->mLastBackupDate = daysTo; | 2023 | KOPrefs::instance()->mLastBackupDate = daysTo; |
2024 | setCaption(i18n("Backup succesfully finished" )); | 2024 | setCaption(i18n("Backup succesfully finished" )); |
2025 | } else if ( retval == 2 ){ | 2025 | } else if ( retval == 2 ){ |
2026 | setCaption(i18n("Backup globally disabled" )); | 2026 | setCaption(i18n("Backup globally disabled" )); |
2027 | qDebug("KO: Backup globally cancelled."); | 2027 | qDebug("KO: Backup globally cancelled."); |
2028 | // backup globally cancelled | 2028 | // backup globally cancelled |
2029 | KPimGlobalPrefs::instance()->mBackupEnabled = false; | 2029 | KPimGlobalPrefs::instance()->mBackupEnabled = false; |
2030 | } | 2030 | } |
2031 | // retval == 3: do nothing, try again later | 2031 | // retval == 3: do nothing, try again later |
2032 | } | 2032 | } |
2033 | void MainWindow::save() | 2033 | void MainWindow::save() |
2034 | { | 2034 | { |
2035 | if ( mSaveDelay ) { | 2035 | if ( mSaveDelay ) { |
2036 | int elapsed = mSaveTimerStart.secsTo( QDateTime::currentDateTime() ); | 2036 | int elapsed = mSaveTimerStart.secsTo( QDateTime::currentDateTime() ); |
2037 | if ( mSaveDelay < elapsed ) { | 2037 | if ( mSaveDelay < elapsed ) { |
2038 | qDebug("KO: Pending save after wakeup from suspend detected."); | 2038 | qDebug("KO: Pending save after wakeup from suspend detected."); |
2039 | qDebug("KO: Save delay %d sec. Elapsed save time %d sec.", mSaveDelay, elapsed ); | 2039 | qDebug("KO: Save delay %d sec. Elapsed save time %d sec.", mSaveDelay, elapsed ); |
2040 | qDebug("KO: Restarting save timer to save in 10 sec."); | 2040 | qDebug("KO: Restarting save timer to save in 10 sec."); |
2041 | int msec = 10000; | 2041 | int msec = 10000; |
2042 | mSaveTimer.start( msec, true ); | 2042 | mSaveTimer.start( msec, true ); |
2043 | mSaveTimerStart = QDateTime::currentDateTime(); | 2043 | mSaveTimerStart = QDateTime::currentDateTime(); |
2044 | mSaveDelay = msec/1000; | 2044 | mSaveDelay = msec/1000; |
2045 | return; | 2045 | return; |
2046 | } | 2046 | } |
2047 | } | 2047 | } |
2048 | if ( mView->viewManager()->journalView() ) | 2048 | if ( mView->viewManager()->journalView() ) |
2049 | mView->viewManager()->journalView()->checkModified(); | 2049 | mView->viewManager()->journalView()->checkModified(); |
2050 | if ( !mCalendarModifiedFlag ) { | 2050 | if ( !mCalendarModifiedFlag ) { |
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 ) { |
2068 | backupAllFiles(); | 2068 | backupAllFiles(); |
2069 | } | 2069 | } |
2070 | ; // KPimGlobalPrefs::instance()->mLastBackupDate | 2070 | ; // KPimGlobalPrefs::instance()->mLastBackupDate |
2071 | } | 2071 | } |
2072 | QTime neededSaveTime; | 2072 | QTime neededSaveTime; |
2073 | neededSaveTime.start(); | 2073 | neededSaveTime.start(); |
2074 | if ( !isMinimized () ) | 2074 | if ( !isMinimized () ) |
2075 | setCaption(i18n("KO/Pi:Saving Data to File ..." )); | 2075 | setCaption(i18n("KO/Pi:Saving Data to File ..." )); |
2076 | qDebug("KO: Start saving data to file!"); | 2076 | qDebug("KO: Start saving data to file!"); |
2077 | if ( mView->saveCalendars() ) | 2077 | if ( mView->saveCalendars() ) |
2078 | mCalendarModifiedFlag = false; | 2078 | mCalendarModifiedFlag = false; |
2079 | int msNeeded = neededSaveTime.elapsed(); | 2079 | int msNeeded = neededSaveTime.elapsed(); |
2080 | qDebug("KO: Needed %d ms for saving.",msNeeded ); | 2080 | qDebug("KO: Needed %d ms for saving.",msNeeded ); |
2081 | QString savemes; | 2081 | QString savemes; |
2082 | savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000 ); | 2082 | savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000 ); |
2083 | if ( !isMinimized () ) | 2083 | if ( !isMinimized () ) |
2084 | setCaption(savemes); | 2084 | setCaption(savemes); |
2085 | else | 2085 | else |
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 | } |
2103 | } | 2103 | } |
2104 | void MainWindow::keyPressEvent ( QKeyEvent * e ) | 2104 | void MainWindow::keyPressEvent ( QKeyEvent * e ) |
2105 | { | 2105 | { |
2106 | qApp->processEvents(); | 2106 | qApp->processEvents(); |
2107 | if ( e->isAutoRepeat() && !mFlagKeyPressed ) { | 2107 | if ( e->isAutoRepeat() && !mFlagKeyPressed ) { |
2108 | e->ignore(); | 2108 | e->ignore(); |
2109 | // qDebug(" ignore %d",e->isAutoRepeat() ); | 2109 | // qDebug(" ignore %d",e->isAutoRepeat() ); |
2110 | return; | 2110 | return; |
2111 | } | 2111 | } |
2112 | if (! e->isAutoRepeat() ) | 2112 | if (! e->isAutoRepeat() ) |
2113 | mFlagKeyPressed = true; | 2113 | mFlagKeyPressed = true; |
2114 | KOPrefs *p = KOPrefs::instance(); | 2114 | KOPrefs *p = KOPrefs::instance(); |
2115 | bool showSelectedDates = false; | 2115 | bool showSelectedDates = false; |
2116 | int size; | 2116 | int size; |
2117 | int pro = 0; | 2117 | int pro = 0; |
2118 | //qDebug("MainWindow::keyPressEvent "); | 2118 | //qDebug("MainWindow::keyPressEvent "); |
2119 | switch ( e->key() ) { | 2119 | switch ( e->key() ) { |
2120 | case Qt::Key_Right: | 2120 | case Qt::Key_Right: |
2121 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) | 2121 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) |
2122 | mView->goNextMonth(); | 2122 | mView->goNextMonth(); |
2123 | else | 2123 | else |
2124 | mView->goNext(); | 2124 | mView->goNext(); |
2125 | showSelectedDates = true; | 2125 | showSelectedDates = true; |
2126 | break; | 2126 | break; |
2127 | case Qt::Key_Left: | 2127 | case Qt::Key_Left: |
2128 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) | 2128 | if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) |
2129 | mView->goPreviousMonth(); | 2129 | mView->goPreviousMonth(); |
2130 | else | 2130 | else |
2131 | mView->goPrevious(); | 2131 | mView->goPrevious(); |
2132 | showSelectedDates = true; | 2132 | showSelectedDates = true; |
2133 | break; | 2133 | break; |
2134 | case Qt::Key_Down: | 2134 | case Qt::Key_Down: |
2135 | mView->viewManager()->agendaView()->scrollOneHourDown(); | 2135 | mView->viewManager()->agendaView()->scrollOneHourDown(); |
2136 | break; | 2136 | break; |
2137 | case Qt::Key_Up: | 2137 | case Qt::Key_Up: |
2138 | mView->viewManager()->agendaView()->scrollOneHourUp(); | 2138 | mView->viewManager()->agendaView()->scrollOneHourUp(); |
2139 | break; | 2139 | break; |
2140 | case Qt::Key_K: | 2140 | case Qt::Key_K: |
2141 | mView->viewManager()->showMonthViewWeek(); | 2141 | mView->viewManager()->showMonthViewWeek(); |
2142 | break; | 2142 | break; |
@@ -2467,102 +2467,102 @@ void MainWindow::setCaptionToDates() | |||
2467 | setCaption(""); | 2467 | setCaption(""); |
2468 | return; | 2468 | return; |
2469 | } | 2469 | } |
2470 | selDates = KGlobal::locale()->formatDate( date, true); | 2470 | selDates = KGlobal::locale()->formatDate( date, true); |
2471 | if (mView->startDate() < mView->endDate() ) | 2471 | if (mView->startDate() < mView->endDate() ) |
2472 | selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); | 2472 | selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); |
2473 | else { | 2473 | else { |
2474 | QString addString; | 2474 | QString addString; |
2475 | if ( date == QDateTime::currentDateTime().date() ) | 2475 | if ( date == QDateTime::currentDateTime().date() ) |
2476 | addString = i18n("Today"); | 2476 | addString = i18n("Today"); |
2477 | else if ( date == QDateTime::currentDateTime().date().addDays(1) ) | 2477 | else if ( date == QDateTime::currentDateTime().date().addDays(1) ) |
2478 | addString = i18n("Tomorrow"); | 2478 | addString = i18n("Tomorrow"); |
2479 | if ( !addString.isEmpty() ) | 2479 | if ( !addString.isEmpty() ) |
2480 | selDates = addString+", "+selDates ; | 2480 | selDates = addString+", "+selDates ; |
2481 | } | 2481 | } |
2482 | setCaption( i18n("Dates: ") + selDates ); | 2482 | setCaption( i18n("Dates: ") + selDates ); |
2483 | 2483 | ||
2484 | } | 2484 | } |
2485 | void MainWindow::showConfigureAgenda( ) | 2485 | void MainWindow::showConfigureAgenda( ) |
2486 | { | 2486 | { |
2487 | int iii; | 2487 | int iii; |
2488 | for ( iii = 1;iii<= 10 ;++iii ){ | 2488 | for ( iii = 1;iii<= 10 ;++iii ){ |
2489 | configureAgendaMenu->setItemChecked( (iii+1)*2, false ); | 2489 | configureAgendaMenu->setItemChecked( (iii+1)*2, false ); |
2490 | } | 2490 | } |
2491 | configureAgendaMenu->setItemChecked( (KOPrefs::instance()->mHourSize/2)*2, true ); | 2491 | configureAgendaMenu->setItemChecked( (KOPrefs::instance()->mHourSize/2)*2, true ); |
2492 | } | 2492 | } |
2493 | void MainWindow::configureAgenda( int item ) | 2493 | void MainWindow::configureAgenda( int item ) |
2494 | { | 2494 | { |
2495 | if ( KOPrefs::instance()->mHourSize == item ) | 2495 | if ( KOPrefs::instance()->mHourSize == item ) |
2496 | return; | 2496 | return; |
2497 | KOPrefs::instance()->mHourSize=item; | 2497 | KOPrefs::instance()->mHourSize=item; |
2498 | mView->viewManager()->agendaView()->updateConfig(); | 2498 | mView->viewManager()->agendaView()->updateConfig(); |
2499 | } | 2499 | } |
2500 | 2500 | ||
2501 | void MainWindow::saveCalendar() | 2501 | void MainWindow::saveCalendar() |
2502 | { | 2502 | { |
2503 | QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir; | 2503 | QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir; |
2504 | if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir) | 2504 | if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir) |
2505 | bupDir = KGlobalSettings::backupDataDir(); | 2505 | bupDir = KGlobalSettings::backupDataDir(); |
2506 | bupDir = KGlobal::formatMessage ( bupDir, 0 ); | 2506 | bupDir = KGlobal::formatMessage ( bupDir, 0 ); |
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; |
2529 | fn = KFileDialog::getOpenFileName( fn, i18n("Load backup filename"), this ); | 2529 | fn = KFileDialog::getOpenFileName( fn, i18n("Load backup filename"), this ); |
2530 | 2530 | ||
2531 | if ( fn == "" ) | 2531 | if ( fn == "" ) |
2532 | return; | 2532 | return; |
2533 | QFileInfo info; | 2533 | QFileInfo info; |
2534 | info.setFile( fn ); | 2534 | info.setFile( fn ); |
2535 | QString mess; | 2535 | QString mess; |
2536 | bool loadbup = true; | 2536 | bool loadbup = true; |
2537 | if ( info. exists() ) { | 2537 | if ( info. exists() ) { |
2538 | mess = i18n("Backup file from:\n%1\nLoading backup\nfile will delete\nyour current Data!\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); | 2538 | mess = i18n("Backup file from:\n%1\nLoading backup\nfile will delete\nyour current Data!\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); |
2539 | int result = QMessageBox::warning( this, "KO/Pi: Warning!", | 2539 | int result = QMessageBox::warning( this, "KO/Pi: Warning!", |
2540 | mess, | 2540 | mess, |
2541 | i18n("Load!"), i18n("Cancel"), 0, | 2541 | i18n("Load!"), i18n("Cancel"), 0, |
2542 | 0, 1 ); | 2542 | 0, 1 ); |
2543 | if ( result != 0 ) { | 2543 | if ( result != 0 ) { |
2544 | loadbup = false; | 2544 | loadbup = false; |
2545 | } | 2545 | } |
2546 | } else { | 2546 | } else { |
2547 | QMessageBox::warning( this, i18n("KO/Pi: Warning!"), | 2547 | QMessageBox::warning( this, i18n("KO/Pi: Warning!"), |
2548 | i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0, | 2548 | i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0, |
2549 | 0, 1 ); | 2549 | 0, 1 ); |
2550 | 2550 | ||
2551 | return; | 2551 | return; |
2552 | } | 2552 | } |
2553 | if ( loadbup ) { | 2553 | if ( loadbup ) { |
2554 | mView->openCalendar( fn ); | 2554 | mView->openCalendar( fn ); |
2555 | KOPrefs::instance()->mLastLoadFile = fn; | 2555 | KOPrefs::instance()->mLastLoadFile = fn; |
2556 | mess = i18n("KO/Pi:Loaded %1").arg(fn) ; | 2556 | mess = i18n("KO/Pi:Loaded %1").arg(fn) ; |
2557 | setCaption(mess); | 2557 | setCaption(mess); |
2558 | } | 2558 | } |
2559 | #endif | 2559 | #endif |
2560 | 2560 | ||
2561 | } | 2561 | } |
2562 | void MainWindow::quickImportIcal() | 2562 | void MainWindow::quickImportIcal() |
2563 | { | 2563 | { |
2564 | importFile( KOPrefs::instance()->mLastImportFile, false ); | 2564 | importFile( KOPrefs::instance()->mLastImportFile, false ); |
2565 | } | 2565 | } |
2566 | void MainWindow::importFile( QString fn, bool quick ) | 2566 | void MainWindow::importFile( QString fn, bool quick ) |
2567 | { | 2567 | { |
2568 | QFileInfo info; | 2568 | QFileInfo info; |