summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-09-18 13:50:46 (UTC)
committer zautrix <zautrix>2005-09-18 13:50:46 (UTC)
commitc6e493d4e5b9eafcc3402c39e30c4283ce8cc8e5 (patch) (unidiff)
tree94e7bdc361b68a3a569eebe14f66458b3795dd6a /korganizer
parente7cd095ea9e80e26c90cbc2d3bf36921b7541c19 (diff)
downloadkdepimpi-c6e493d4e5b9eafcc3402c39e30c4283ce8cc8e5.zip
kdepimpi-c6e493d4e5b9eafcc3402c39e30c4283ce8cc8e5.tar.gz
kdepimpi-c6e493d4e5b9eafcc3402c39e30c4283ce8cc8e5.tar.bz2
delay
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp13
-rw-r--r--korganizer/calendarview.h3
-rw-r--r--korganizer/mainwindow.cpp69
-rw-r--r--korganizer/mainwindow.h5
4 files changed, 69 insertions, 21 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 79fb727..2ba8528 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2358,384 +2358,385 @@ bool CalendarView::addCalendar( KopiCalendarFile * cal )
2358 cal->mErrorOnLoad = true; 2358 cal->mErrorOnLoad = true;
2359 return false; 2359 return false;
2360} 2360}
2361bool CalendarView::openCalendar(QString filename, bool merge) 2361bool CalendarView::openCalendar(QString filename, bool merge)
2362{ 2362{
2363 2363
2364 if (filename.isEmpty()) { 2364 if (filename.isEmpty()) {
2365 return false; 2365 return false;
2366 } 2366 }
2367 2367
2368 if (!QFile::exists(filename)) { 2368 if (!QFile::exists(filename)) {
2369 KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); 2369 KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename));
2370 return false; 2370 return false;
2371 } 2371 }
2372 2372
2373 globalFlagBlockAgenda = 1; 2373 globalFlagBlockAgenda = 1;
2374 clearAllViews(); 2374 clearAllViews();
2375 if (!merge) { 2375 if (!merge) {
2376 mViewManager->setDocumentId( filename ); 2376 mViewManager->setDocumentId( filename );
2377 mCalendar->close(); 2377 mCalendar->close();
2378 } 2378 }
2379 mStorage->setFileName( filename ); 2379 mStorage->setFileName( filename );
2380 2380
2381 if ( mStorage->load() ) { 2381 if ( mStorage->load() ) {
2382 if ( merge ) ;//setModified( true ); 2382 if ( merge ) ;//setModified( true );
2383 else { 2383 else {
2384 //setModified( true ); 2384 //setModified( true );
2385 mViewManager->setDocumentId( filename ); 2385 mViewManager->setDocumentId( filename );
2386 mDialogManager->setDocumentId( filename ); 2386 mDialogManager->setDocumentId( filename );
2387 mTodoList->setDocumentId( filename ); 2387 mTodoList->setDocumentId( filename );
2388 } 2388 }
2389 globalFlagBlockAgenda = 2; 2389 globalFlagBlockAgenda = 2;
2390 // if ( getLastSyncEvent() ) 2390 // if ( getLastSyncEvent() )
2391 // getLastSyncEvent()->setReadOnly( true ); 2391 // getLastSyncEvent()->setReadOnly( true );
2392 mCalendar->reInitAlarmSettings(); 2392 mCalendar->reInitAlarmSettings();
2393 setSyncEventsReadOnly(); 2393 setSyncEventsReadOnly();
2394 //updateUnmanagedViews(); 2394 //updateUnmanagedViews();
2395 //updateView(); 2395 //updateView();
2396 if ( filename != MainWindow::defaultFileName() ) { 2396 if ( filename != MainWindow::defaultFileName() ) {
2397 saveCalendar( MainWindow::defaultFileName() ); 2397 saveCalendar( MainWindow::defaultFileName() );
2398 } else { 2398 } else {
2399 QFileInfo finf ( MainWindow::defaultFileName()); 2399 QFileInfo finf ( MainWindow::defaultFileName());
2400 if ( finf.exists() ) { 2400 if ( finf.exists() ) {
2401 setLoadedFileVersion( finf.lastModified () ); 2401 setLoadedFileVersion( finf.lastModified () );
2402 } 2402 }
2403 } 2403 }
2404 return true; 2404 return true;
2405 } else { 2405 } else {
2406 // while failing to load, the calendar object could 2406 // while failing to load, the calendar object could
2407 // have become partially populated. Clear it out. 2407 // have become partially populated. Clear it out.
2408 if ( !merge ) { 2408 if ( !merge ) {
2409 mCalendar->close(); 2409 mCalendar->close();
2410 mViewManager->setDocumentId( filename ); 2410 mViewManager->setDocumentId( filename );
2411 mDialogManager->setDocumentId( filename ); 2411 mDialogManager->setDocumentId( filename );
2412 mTodoList->setDocumentId( filename ); 2412 mTodoList->setDocumentId( filename );
2413 } 2413 }
2414 2414
2415 //KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename)); 2415 //KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename));
2416 2416
2417 QTimer::singleShot ( 1, this, SLOT ( showOpenError() ) ); 2417 QTimer::singleShot ( 1, this, SLOT ( showOpenError() ) );
2418 globalFlagBlockAgenda = 2; 2418 globalFlagBlockAgenda = 2;
2419 mCalendar->reInitAlarmSettings(); 2419 mCalendar->reInitAlarmSettings();
2420 setSyncEventsReadOnly(); 2420 setSyncEventsReadOnly();
2421 updateUnmanagedViews(); 2421 updateUnmanagedViews();
2422 updateView(); 2422 updateView();
2423 } 2423 }
2424 return false; 2424 return false;
2425} 2425}
2426void CalendarView::mergeFile( QString fn ) 2426void CalendarView::mergeFile( QString fn )
2427{ 2427{
2428 clearAllViews(); 2428 clearAllViews();
2429 mCalendar->mergeCalendarFile( fn ); 2429 mCalendar->mergeCalendarFile( fn );
2430 mCalendar->reInitAlarmSettings(); 2430 mCalendar->reInitAlarmSettings();
2431 setSyncEventsReadOnly(); 2431 setSyncEventsReadOnly();
2432 updateUnmanagedViews(); 2432 updateUnmanagedViews();
2433 updateView(); 2433 updateView();
2434} 2434}
2435void CalendarView::showOpenError() 2435void CalendarView::showOpenError()
2436{ 2436{
2437 KMessageBox::error(this,i18n("Couldn't load calendar\n.")); 2437 KMessageBox::error(this,i18n("Couldn't load calendar\n."));
2438} 2438}
2439void CalendarView::setLoadedFileVersion(QDateTime dt) 2439void CalendarView::setLoadedFileVersion(QDateTime dt)
2440{ 2440{
2441 loadedFileVersion = dt; 2441 loadedFileVersion = dt;
2442} 2442}
2443bool CalendarView::checkFileChanged(QString fn) 2443bool CalendarView::checkFileChanged(QString fn)
2444{ 2444{
2445 QFileInfo finf ( fn ); 2445 QFileInfo finf ( fn );
2446 if ( !finf.exists() ) 2446 if ( !finf.exists() )
2447 return true; 2447 return true;
2448 QDateTime dt = finf.lastModified (); 2448 QDateTime dt = finf.lastModified ();
2449 if ( dt <= loadedFileVersion ) 2449 if ( dt <= loadedFileVersion )
2450 return false; 2450 return false;
2451 return true; 2451 return true;
2452 2452
2453} 2453}
2454void CalendarView::watchSavedFile() 2454void CalendarView::watchSavedFile()
2455{ 2455{
2456 QFileInfo finf ( MainWindow::defaultFileName()); 2456 QFileInfo finf ( MainWindow::defaultFileName());
2457 if ( !finf.exists() ) 2457 if ( !finf.exists() )
2458 return; 2458 return;
2459 QDateTime dt = finf.lastModified (); 2459 QDateTime dt = finf.lastModified ();
2460 if ( dt < loadedFileVersion ) { 2460 if ( dt < loadedFileVersion ) {
2461 //qDebug("watch %s %s ", dt.toString().latin1(), loadedFileVersion.toString().latin1()); 2461 //qDebug("watch %s %s ", dt.toString().latin1(), loadedFileVersion.toString().latin1());
2462 QTimer::singleShot( 1000 , this, SLOT ( watchSavedFile() ) ); 2462 QTimer::singleShot( 1000 , this, SLOT ( watchSavedFile() ) );
2463 return; 2463 return;
2464 } 2464 }
2465 loadedFileVersion = dt; 2465 loadedFileVersion = dt;
2466} 2466}
2467bool CalendarView::checkAllFileVersions() 2467bool CalendarView::checkAllFileVersions()
2468{ 2468{
2469 QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; 2469 QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
2470 KopiCalendarFile * cal = calendars.first(); 2470 KopiCalendarFile * cal = calendars.first();
2471 mCalendar->setDefaultCalendar( 1 ); 2471 mCalendar->setDefaultCalendar( 1 );
2472 mCalendar->setDefaultCalendarEnabledOnly(); 2472 mCalendar->setDefaultCalendarEnabledOnly();
2473 if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { 2473 if ( !cal->isReadOnly && !cal->mErrorOnLoad ) {
2474 if ( !checkFileVersion(MainWindow::defaultFileName())) { 2474 if ( !checkFileVersion(MainWindow::defaultFileName())) {
2475 restoreCalendarSettings(); 2475 restoreCalendarSettings();
2476 return false; 2476 return false;
2477 } 2477 }
2478 } 2478 }
2479 cal = calendars.next(); 2479 cal = calendars.next();
2480 QDateTime storeTemp = loadedFileVersion; 2480 QDateTime storeTemp = loadedFileVersion;
2481 while ( cal ) { 2481 while ( cal ) {
2482 if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { 2482 if ( !cal->isReadOnly && !cal->mErrorOnLoad ) {
2483 mCalendar->setDefaultCalendar( cal->mCalNumber ); 2483 mCalendar->setDefaultCalendar( cal->mCalNumber );
2484 mCalendar->setDefaultCalendarEnabledOnly(); 2484 mCalendar->setDefaultCalendarEnabledOnly();
2485 loadedFileVersion = cal->mLoadDt.addSecs( 15 ); 2485 loadedFileVersion = cal->mLoadDt.addSecs( 15 );
2486 if ( !checkFileVersion(cal->mFileName )) { 2486 if ( !checkFileVersion(cal->mFileName )) {
2487 loadedFileVersion = storeTemp; 2487 loadedFileVersion = storeTemp;
2488 restoreCalendarSettings(); 2488 restoreCalendarSettings();
2489 return false; 2489 return false;
2490 } 2490 }
2491 } 2491 }
2492 cal = calendars.next(); 2492 cal = calendars.next();
2493 } 2493 }
2494 loadedFileVersion = storeTemp; 2494 loadedFileVersion = storeTemp;
2495 return true; 2495 return true;
2496} 2496}
2497bool CalendarView::checkFileVersion(QString fn) 2497bool CalendarView::checkFileVersion(QString fn)
2498{ 2498{
2499 QFileInfo finf ( fn ); 2499 QFileInfo finf ( fn );
2500 if ( !finf.exists() ) 2500 if ( !finf.exists() )
2501 return true; 2501 return true;
2502 QDateTime dt = finf.lastModified (); 2502 QDateTime dt = finf.lastModified ();
2503 //qDebug("loaded file version %s %s", fn.latin1(), loadedFileVersion.toString().latin1()); 2503 //qDebug("loaded file version %s %s", fn.latin1(), loadedFileVersion.toString().latin1());
2504 //qDebug("file on disk version %s %s", fn.latin1(),dt.toString().latin1()); 2504 //qDebug("file on disk version %s %s", fn.latin1(),dt.toString().latin1());
2505 if ( dt <= loadedFileVersion ) 2505 if ( dt <= loadedFileVersion )
2506 return true; 2506 return true;
2507 int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg(KGlobal::formatMessage(fn,0)).arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) , 2507 int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg(KGlobal::formatMessage(fn,0)).arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) ,
2508 i18n("KO/Pi Warning"),i18n("Overwrite"), 2508 i18n("KO/Pi Warning"),i18n("Overwrite"),
2509 i18n("Sync+save")); 2509 i18n("Sync+save"));
2510 2510
2511 if ( km == KMessageBox::Cancel ) 2511 if ( km == KMessageBox::Cancel )
2512 return false; 2512 return false;
2513 if ( km == KMessageBox::Yes ) 2513 if ( km == KMessageBox::Yes )
2514 return true; 2514 return true;
2515 2515
2516 setSyncDevice("deleteaftersync" ); 2516 setSyncDevice("deleteaftersync" );
2517 mSyncManager->mAskForPreferences = true; 2517 mSyncManager->mAskForPreferences = true;
2518 mSyncManager->mSyncAlgoPrefs = 3; 2518 mSyncManager->mSyncAlgoPrefs = 3;
2519 mSyncManager->mWriteBackFile = false; 2519 mSyncManager->mWriteBackFile = false;
2520 mSyncManager->mWriteBackExistingOnly = false; 2520 mSyncManager->mWriteBackExistingOnly = false;
2521 mSyncManager->mShowSyncSummary = false; 2521 mSyncManager->mShowSyncSummary = false;
2522 syncCalendar( fn, 3 ); 2522 syncCalendar( fn, 3 );
2523 Event * e = getLastSyncEvent(); 2523 Event * e = getLastSyncEvent();
2524 if ( e ) 2524 if ( e )
2525 mCalendar->deleteEvent( e ); 2525 mCalendar->deleteEvent( e );
2526 return true; 2526 return true;
2527} 2527}
2528bool CalendarView::saveCalendars() 2528bool CalendarView::saveCalendars()
2529{ 2529{
2530 QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; 2530 QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
2531 KopiCalendarFile * cal = calendars.first(); 2531 KopiCalendarFile * cal = calendars.first();
2532 mCalendar->setDefaultCalendar( 1 ); 2532 mCalendar->setDefaultCalendar( 1 );
2533 mCalendar->setDefaultCalendarEnabledOnly(); 2533 mCalendar->setDefaultCalendarEnabledOnly();
2534 QString saveError; 2534 QString saveError;
2535 if ( !saveCalendar( MainWindow::defaultFileName() ) ) 2535 if ( !saveCalendar( MainWindow::defaultFileName() ) )
2536 saveError = cal->mName +"\n"; 2536 saveError = cal->mName +"\n";
2537 cal = calendars.next(); 2537 cal = calendars.next();
2538 while ( cal ) { 2538 while ( cal ) {
2539 if ( !cal->isReadOnly && !cal->mErrorOnLoad ) { 2539 if ( !cal->isReadOnly && !cal->mErrorOnLoad ) {
2540 mCalendar->setDefaultCalendar( cal->mCalNumber ); 2540 mCalendar->setDefaultCalendar( cal->mCalNumber );
2541 mCalendar->setDefaultCalendarEnabledOnly(); 2541 mCalendar->setDefaultCalendarEnabledOnly();
2542 if ( saveCalendar( cal->mFileName ) ) 2542 if ( saveCalendar( cal->mFileName ) )
2543 cal->mLoadDt = QDateTime::currentDateTime(); 2543 cal->mLoadDt = QDateTime::currentDateTime();
2544 else 2544 else
2545 saveError += cal->mName + "\n"; 2545 saveError += cal->mName + "\n";
2546 } 2546 }
2547 cal = calendars.next(); 2547 cal = calendars.next();
2548 } 2548 }
2549 restoreCalendarSettings(); 2549 restoreCalendarSettings();
2550 //saveError = "test error";
2550 if ( !saveError.isEmpty() ) { 2551 if ( !saveError.isEmpty() ) {
2551 saveError = KGlobal::formatMessage( i18n("Calendar(s) not saved:"),0 )+"\n" + saveError; 2552 saveError = KGlobal::formatMessage( i18n("Calendar(s) not saved:"),0 )+"\n" + saveError;
2552 KMessageBox::error(this, saveError, i18n("Error saving data")); 2553 KMessageBox::error(this, saveError, i18n("Error saving data"));
2553 return false; 2554 return false;
2554 } 2555 }
2555 return true; 2556 return true;
2556} 2557}
2557bool CalendarView::saveCalendar( QString filename ) 2558bool CalendarView::saveCalendar( QString filename )
2558{ 2559{
2559 2560
2560 // Store back all unsaved data into calendar object 2561 // Store back all unsaved data into calendar object
2561 // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() ); 2562 // qDebug("file %s %d ", filename.latin1() , mViewManager->currentView() );
2562 if ( mViewManager->currentView() ) 2563 if ( mViewManager->currentView() )
2563 mViewManager->currentView()->flushView(); 2564 mViewManager->currentView()->flushView();
2564 2565
2565 2566
2566 QDateTime lfv = QDateTime::currentDateTime().addSecs( -2); 2567 QDateTime lfv = QDateTime::currentDateTime().addSecs( -2);
2567 mStorage->setSaveFormat( new ICalFormat() ); 2568 mStorage->setSaveFormat( new ICalFormat() );
2568 mStorage->setFileName( filename ); 2569 mStorage->setFileName( filename );
2569 bool success; 2570 bool success;
2570 success = mStorage->save(); 2571 success = mStorage->save();
2571 if ( !success ) { 2572 if ( !success ) {
2572 return false; 2573 return false;
2573 } 2574 }
2574 if ( filename == MainWindow::defaultFileName() ) { 2575 if ( filename == MainWindow::defaultFileName() ) {
2575 setLoadedFileVersion( lfv ); 2576 setLoadedFileVersion( lfv );
2576 watchSavedFile(); 2577 watchSavedFile();
2577 } 2578 }
2578 return true; 2579 return true;
2579} 2580}
2580 2581
2581void CalendarView::closeCalendar() 2582void CalendarView::closeCalendar()
2582{ 2583{
2583 2584
2584 // child windows no longer valid 2585 // child windows no longer valid
2585 clearAllViews(); 2586 clearAllViews();
2586 emit closingDown(); 2587 emit closingDown();
2587 2588
2588 mCalendar->close(); 2589 mCalendar->close();
2589 setModified(false); 2590 setModified(false);
2590 updateView(); 2591 updateView();
2591} 2592}
2592 2593
2593void CalendarView::archiveCalendar() 2594void CalendarView::archiveCalendar()
2594{ 2595{
2595 mDialogManager->showArchiveDialog(); 2596 mDialogManager->showArchiveDialog();
2596} 2597}
2597 2598
2598 2599
2599void CalendarView::readSettings() 2600void CalendarView::readSettings()
2600{ 2601{
2601 2602
2602 2603
2603 // mViewManager->showAgendaView(); 2604 // mViewManager->showAgendaView();
2604 QString str; 2605 QString str;
2605 //qDebug("CalendarView::readSettings() "); 2606 //qDebug("CalendarView::readSettings() ");
2606 // read settings from the KConfig, supplying reasonable 2607 // read settings from the KConfig, supplying reasonable
2607 // defaults where none are to be found 2608 // defaults where none are to be found
2608 KConfig *config = KOGlobals::config(); 2609 KConfig *config = KOGlobals::config();
2609#ifndef KORG_NOSPLITTER 2610#ifndef KORG_NOSPLITTER
2610 config->setGroup("KOrganizer Geometry"); 2611 config->setGroup("KOrganizer Geometry");
2611 2612
2612 QValueList<int> sizes = config->readIntListEntry("Separator1"); 2613 QValueList<int> sizes = config->readIntListEntry("Separator1");
2613 if (sizes.count() != 2) { 2614 if (sizes.count() != 2) {
2614 sizes << mDateNavigator->minimumSizeHint().width(); 2615 sizes << mDateNavigator->minimumSizeHint().width();
2615 sizes << 300; 2616 sizes << 300;
2616 } 2617 }
2617 mPanner->setSizes(sizes); 2618 mPanner->setSizes(sizes);
2618 2619
2619 sizes = config->readIntListEntry("Separator2"); 2620 sizes = config->readIntListEntry("Separator2");
2620 if ( ( mResourceView && sizes.count() == 4 ) || 2621 if ( ( mResourceView && sizes.count() == 4 ) ||
2621 ( !mResourceView && sizes.count() == 3 ) ) { 2622 ( !mResourceView && sizes.count() == 3 ) ) {
2622 mLeftSplitter->setSizes(sizes); 2623 mLeftSplitter->setSizes(sizes);
2623 } 2624 }
2624#endif 2625#endif
2625 globalFlagBlockAgenda = 1; 2626 globalFlagBlockAgenda = 1;
2626 mViewManager->showAgendaView(); 2627 mViewManager->showAgendaView();
2627 //mViewManager->readSettings( config ); 2628 //mViewManager->readSettings( config );
2628 mTodoList->restoreLayout(config,QString("Todo Layout")); 2629 mTodoList->restoreLayout(config,QString("Todo Layout"));
2629 readFilterSettings(config); 2630 readFilterSettings(config);
2630 2631
2631#ifdef DESKTOP_VERSION 2632#ifdef DESKTOP_VERSION
2632 config->setGroup("WidgetLayout"); 2633 config->setGroup("WidgetLayout");
2633 QStringList list; 2634 QStringList list;
2634 list = config->readListEntry("MainLayout"); 2635 list = config->readListEntry("MainLayout");
2635 int x,y,w,h; 2636 int x,y,w,h;
2636 if ( ! list.isEmpty() ) { 2637 if ( ! list.isEmpty() ) {
2637 x = list[0].toInt(); 2638 x = list[0].toInt();
2638 y = list[1].toInt(); 2639 y = list[1].toInt();
2639 w = list[2].toInt(); 2640 w = list[2].toInt();
2640 h = list[3].toInt(); 2641 h = list[3].toInt();
2641 KApplication::testCoords( &x,&y,&w,&h ); 2642 KApplication::testCoords( &x,&y,&w,&h );
2642 topLevelWidget()->setGeometry(x,y,w,h); 2643 topLevelWidget()->setGeometry(x,y,w,h);
2643 2644
2644 } else { 2645 } else {
2645 topLevelWidget()->setGeometry( 40 ,40 , 640, 440); 2646 topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
2646 } 2647 }
2647 list = config->readListEntry("EditEventLayout"); 2648 list = config->readListEntry("EditEventLayout");
2648 if ( ! list.isEmpty() ) { 2649 if ( ! list.isEmpty() ) {
2649 x = list[0].toInt(); 2650 x = list[0].toInt();
2650 y = list[1].toInt(); 2651 y = list[1].toInt();
2651 w = list[2].toInt(); 2652 w = list[2].toInt();
2652 h = list[3].toInt(); 2653 h = list[3].toInt();
2653 KApplication::testCoords( &x,&y,&w,&h ); 2654 KApplication::testCoords( &x,&y,&w,&h );
2654 mEventEditor->setGeometry(x,y,w,h); 2655 mEventEditor->setGeometry(x,y,w,h);
2655 2656
2656 } 2657 }
2657 list = config->readListEntry("EditTodoLayout"); 2658 list = config->readListEntry("EditTodoLayout");
2658 if ( ! list.isEmpty() ) { 2659 if ( ! list.isEmpty() ) {
2659 x = list[0].toInt(); 2660 x = list[0].toInt();
2660 y = list[1].toInt(); 2661 y = list[1].toInt();
2661 w = list[2].toInt(); 2662 w = list[2].toInt();
2662 h = list[3].toInt(); 2663 h = list[3].toInt();
2663 KApplication::testCoords( &x,&y,&w,&h ); 2664 KApplication::testCoords( &x,&y,&w,&h );
2664 mTodoEditor->setGeometry(x,y,w,h); 2665 mTodoEditor->setGeometry(x,y,w,h);
2665 2666
2666 } 2667 }
2667 list = config->readListEntry("ViewerLayout"); 2668 list = config->readListEntry("ViewerLayout");
2668 if ( ! list.isEmpty() ) { 2669 if ( ! list.isEmpty() ) {
2669 x = list[0].toInt(); 2670 x = list[0].toInt();
2670 y = list[1].toInt(); 2671 y = list[1].toInt();
2671 w = list[2].toInt(); 2672 w = list[2].toInt();
2672 h = list[3].toInt(); 2673 h = list[3].toInt();
2673 KApplication::testCoords( &x,&y,&w,&h ); 2674 KApplication::testCoords( &x,&y,&w,&h );
2674 getEventViewerDialog()->setGeometry(x,y,w,h); 2675 getEventViewerDialog()->setGeometry(x,y,w,h);
2675 } 2676 }
2676#endif 2677#endif
2677 config->setGroup( "Views" ); 2678 config->setGroup( "Views" );
2678 int dateCount = config->readNumEntry( "ShownDatesCount", 7 ); 2679 int dateCount = config->readNumEntry( "ShownDatesCount", 7 );
2679 2680
2680 QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame"); 2681 QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame");
2681 2682
2682 int resetval = 0; 2683 int resetval = 0;
2683 int maxVal = 0; 2684 int maxVal = 0;
2684 if (sizes.count() != 3) { 2685 if (sizes.count() != 3) {
2685 if ( KOPrefs::instance()->mVerticalScreen ) { 2686 if ( KOPrefs::instance()->mVerticalScreen ) {
2686 resetval = mDateNavigator->sizeHint().width()+2; 2687 resetval = mDateNavigator->sizeHint().width()+2;
2687 } else { 2688 } else {
2688 resetval = mDateNavigator->sizeHint().height()+2; 2689 resetval = mDateNavigator->sizeHint().height()+2;
2689 } 2690 }
2690 } 2691 }
2691 if ( resetval ) { 2692 if ( resetval ) {
2692 sizes.clear(); 2693 sizes.clear();
2693 if ( KOPrefs::instance()->mVerticalScreen ) { 2694 if ( KOPrefs::instance()->mVerticalScreen ) {
2694 maxVal = QApplication::desktop()->width() -10; 2695 maxVal = QApplication::desktop()->width() -10;
2695 } else { 2696 } else {
2696 maxVal = QApplication::desktop()->height()-10; 2697 maxVal = QApplication::desktop()->height()-10;
2697 } 2698 }
2698 sizes << resetval; 2699 sizes << resetval;
2699 if ( maxVal < resetval + resetval) 2700 if ( maxVal < resetval + resetval)
2700 resetval = maxVal - resetval; 2701 resetval = maxVal - resetval;
2701 sizes << resetval; 2702 sizes << resetval;
2702 sizes << 100; 2703 sizes << 100;
2703 } 2704 }
2704 mLeftFrame->setSizes(sizes); 2705 mLeftFrame->setSizes(sizes);
2705 sizes = config->readIntListEntry("Main Splitter Frame"); 2706 sizes = config->readIntListEntry("Main Splitter Frame");
2706 resetval = 0; 2707 resetval = 0;
2707 maxVal = 0; 2708 maxVal = 0;
2708 if (sizes.count() != 2) { 2709 if (sizes.count() != 2) {
2709 if ( !KOPrefs::instance()->mVerticalScreen ) { 2710 if ( !KOPrefs::instance()->mVerticalScreen ) {
2710 resetval = mDateNavigator->sizeHint().width()+2; 2711 resetval = mDateNavigator->sizeHint().width()+2;
2711 } else { 2712 } else {
2712 resetval = mDateNavigator->sizeHint().height()+2; 2713 resetval = mDateNavigator->sizeHint().height()+2;
2713 } 2714 }
2714 } 2715 }
2715 if ( resetval ) { 2716 if ( resetval ) {
2716 sizes.clear(); 2717 sizes.clear();
2717 if ( !KOPrefs::instance()->mVerticalScreen ) { 2718 if ( !KOPrefs::instance()->mVerticalScreen ) {
2718 maxVal = QApplication::desktop()->width() -10; 2719 maxVal = QApplication::desktop()->width() -10;
2719 } else { 2720 } else {
2720 maxVal = QApplication::desktop()->height()-10; 2721 maxVal = QApplication::desktop()->height()-10;
2721 } 2722 }
2722 sizes << resetval; 2723 sizes << resetval;
2723 if ( maxVal < resetval + resetval) 2724 if ( maxVal < resetval + resetval)
2724 resetval = maxVal - resetval; 2725 resetval = maxVal - resetval;
2725 sizes << resetval; 2726 sizes << resetval;
2726 } 2727 }
2727 mMainFrame->setSizes(sizes); 2728 mMainFrame->setSizes(sizes);
2728 if ( dateCount == 5 ) mNavigator->selectWorkWeek(); 2729 if ( dateCount == 5 ) mNavigator->selectWorkWeek();
2729 else if ( dateCount == 7 ) mNavigator->selectWeek(); 2730 else if ( dateCount == 7 ) mNavigator->selectWeek();
2730 else mNavigator->selectDates( dateCount ); 2731 else mNavigator->selectDates( dateCount );
2731 // mViewManager->readSettings( config ); 2732 // mViewManager->readSettings( config );
2732 updateConfig(); 2733 updateConfig();
2733 globalFlagBlockAgenda = 2; 2734 globalFlagBlockAgenda = 2;
2734 mViewManager->readSettings( config ); 2735 mViewManager->readSettings( config );
2735 QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) ); 2736 QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) );
2736} 2737}
2737 2738
2738void CalendarView::checkSuspendAlarm() 2739void CalendarView::checkSuspendAlarm()
2739{ 2740{
2740 if ( mSuspendTimer->isActive() ) { 2741 if ( mSuspendTimer->isActive() ) {
2741 KMessageBox::information( this, i18n("<b>WARNING:</b> There is a pending suspended alarm!"), i18n("Pending Suspend Alarm")); 2742 KMessageBox::information( this, i18n("<b>WARNING:</b> There is a pending suspended alarm!"), i18n("Pending Suspend Alarm"));
@@ -4274,394 +4275,396 @@ void CalendarView::schedule_request(Incidence *incidence)
4274void CalendarView::schedule_refresh(Incidence *incidence) 4275void CalendarView::schedule_refresh(Incidence *incidence)
4275{ 4276{
4276 schedule(Scheduler::Refresh,incidence); 4277 schedule(Scheduler::Refresh,incidence);
4277} 4278}
4278 4279
4279void CalendarView::schedule_cancel(Incidence *incidence) 4280void CalendarView::schedule_cancel(Incidence *incidence)
4280{ 4281{
4281 schedule(Scheduler::Cancel,incidence); 4282 schedule(Scheduler::Cancel,incidence);
4282} 4283}
4283 4284
4284void CalendarView::schedule_add(Incidence *incidence) 4285void CalendarView::schedule_add(Incidence *incidence)
4285{ 4286{
4286 schedule(Scheduler::Add,incidence); 4287 schedule(Scheduler::Add,incidence);
4287} 4288}
4288 4289
4289void CalendarView::schedule_reply(Incidence *incidence) 4290void CalendarView::schedule_reply(Incidence *incidence)
4290{ 4291{
4291 schedule(Scheduler::Reply,incidence); 4292 schedule(Scheduler::Reply,incidence);
4292} 4293}
4293 4294
4294void CalendarView::schedule_counter(Incidence *incidence) 4295void CalendarView::schedule_counter(Incidence *incidence)
4295{ 4296{
4296 schedule(Scheduler::Counter,incidence); 4297 schedule(Scheduler::Counter,incidence);
4297} 4298}
4298 4299
4299void CalendarView::schedule_declinecounter(Incidence *incidence) 4300void CalendarView::schedule_declinecounter(Incidence *incidence)
4300{ 4301{
4301 schedule(Scheduler::Declinecounter,incidence); 4302 schedule(Scheduler::Declinecounter,incidence);
4302} 4303}
4303 4304
4304void CalendarView::schedule_publish_freebusy(int daysToPublish) 4305void CalendarView::schedule_publish_freebusy(int daysToPublish)
4305{ 4306{
4306 QDateTime start = QDateTime::currentDateTime(); 4307 QDateTime start = QDateTime::currentDateTime();
4307 QDateTime end = start.addDays(daysToPublish); 4308 QDateTime end = start.addDays(daysToPublish);
4308 4309
4309 FreeBusy *freebusy = new FreeBusy(mCalendar, start, end); 4310 FreeBusy *freebusy = new FreeBusy(mCalendar, start, end);
4310 freebusy->setOrganizer(KOPrefs::instance()->email()); 4311 freebusy->setOrganizer(KOPrefs::instance()->email());
4311 4312
4312 4313
4313 PublishDialog *publishdlg = new PublishDialog(); 4314 PublishDialog *publishdlg = new PublishDialog();
4314 if ( publishdlg->exec() == QDialog::Accepted ) { 4315 if ( publishdlg->exec() == QDialog::Accepted ) {
4315 OutgoingDialog *dlg = mDialogManager->outgoingDialog(); 4316 OutgoingDialog *dlg = mDialogManager->outgoingDialog();
4316 if (!dlg->addMessage(freebusy,Scheduler::Publish,publishdlg->addresses())) { 4317 if (!dlg->addMessage(freebusy,Scheduler::Publish,publishdlg->addresses())) {
4317 delete(freebusy); 4318 delete(freebusy);
4318 } 4319 }
4319 } 4320 }
4320 delete publishdlg; 4321 delete publishdlg;
4321} 4322}
4322 4323
4323void CalendarView::schedule(Scheduler::Method method, Incidence *incidence) 4324void CalendarView::schedule(Scheduler::Method method, Incidence *incidence)
4324{ 4325{
4325 Event *event = 0; 4326 Event *event = 0;
4326 Todo *todo = 0; 4327 Todo *todo = 0;
4327 4328
4328 if (incidence == 0) { 4329 if (incidence == 0) {
4329 incidence = mViewManager->currentView()->selectedIncidences().first(); 4330 incidence = mViewManager->currentView()->selectedIncidences().first();
4330 if (incidence == 0) { 4331 if (incidence == 0) {
4331 incidence = mTodoList->selectedIncidences().first(); 4332 incidence = mTodoList->selectedIncidences().first();
4332 } 4333 }
4333 } 4334 }
4334 if ( incidence && incidence->typeID() == eventID ) { 4335 if ( incidence && incidence->typeID() == eventID ) {
4335 event = static_cast<Event *>(incidence); 4336 event = static_cast<Event *>(incidence);
4336 } 4337 }
4337 if ( incidence && incidence->typeID() == todoID ) { 4338 if ( incidence && incidence->typeID() == todoID ) {
4338 todo = static_cast<Todo *>(incidence); 4339 todo = static_cast<Todo *>(incidence);
4339 } 4340 }
4340 4341
4341 if (!event && !todo) { 4342 if (!event && !todo) {
4342 KMessageBox::sorry(this,i18n("No event selected.")); 4343 KMessageBox::sorry(this,i18n("No event selected."));
4343 return; 4344 return;
4344 } 4345 }
4345 4346
4346 if( incidence->attendeeCount() == 0 && method != Scheduler::Publish ) { 4347 if( incidence->attendeeCount() == 0 && method != Scheduler::Publish ) {
4347 KMessageBox::sorry(this,i18n("The event has no attendees.")); 4348 KMessageBox::sorry(this,i18n("The event has no attendees."));
4348 return; 4349 return;
4349 } 4350 }
4350 4351
4351 Event *ev = 0; 4352 Event *ev = 0;
4352 if (event) ev = new Event(*event); 4353 if (event) ev = new Event(*event);
4353 Todo *to = 0; 4354 Todo *to = 0;
4354 if (todo) to = new Todo(*todo); 4355 if (todo) to = new Todo(*todo);
4355 4356
4356 if (method == Scheduler::Reply || method == Scheduler::Refresh) { 4357 if (method == Scheduler::Reply || method == Scheduler::Refresh) {
4357 Attendee *me = incidence->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email()); 4358 Attendee *me = incidence->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email());
4358 if (!me) { 4359 if (!me) {
4359 KMessageBox::sorry(this,i18n("Could not find your attendee entry.\nPlease check the emails.")); 4360 KMessageBox::sorry(this,i18n("Could not find your attendee entry.\nPlease check the emails."));
4360 return; 4361 return;
4361 } 4362 }
4362 if (me->status()==Attendee::NeedsAction && me->RSVP() && method==Scheduler::Reply) { 4363 if (me->status()==Attendee::NeedsAction && me->RSVP() && method==Scheduler::Reply) {
4363 StatusDialog *statdlg = new StatusDialog(this); 4364 StatusDialog *statdlg = new StatusDialog(this);
4364 if (!statdlg->exec()==QDialog::Accepted) return; 4365 if (!statdlg->exec()==QDialog::Accepted) return;
4365 me->setStatus( statdlg->status() ); 4366 me->setStatus( statdlg->status() );
4366 delete(statdlg); 4367 delete(statdlg);
4367 } 4368 }
4368 Attendee *menew = new Attendee(*me); 4369 Attendee *menew = new Attendee(*me);
4369 if (ev) { 4370 if (ev) {
4370 ev->clearAttendees(); 4371 ev->clearAttendees();
4371 ev->addAttendee(menew,false); 4372 ev->addAttendee(menew,false);
4372 } else { 4373 } else {
4373 if (to) { 4374 if (to) {
4374 todo->clearAttendees(); 4375 todo->clearAttendees();
4375 todo->addAttendee(menew,false); 4376 todo->addAttendee(menew,false);
4376 } 4377 }
4377 } 4378 }
4378 } 4379 }
4379 4380
4380 OutgoingDialog *dlg = mDialogManager->outgoingDialog(); 4381 OutgoingDialog *dlg = mDialogManager->outgoingDialog();
4381 if (ev) { 4382 if (ev) {
4382 if ( !dlg->addMessage(ev,method) ) delete(ev); 4383 if ( !dlg->addMessage(ev,method) ) delete(ev);
4383 } else { 4384 } else {
4384 if (to) { 4385 if (to) {
4385 if ( !dlg->addMessage(to,method) ) delete(to); 4386 if ( !dlg->addMessage(to,method) ) delete(to);
4386 } 4387 }
4387 } 4388 }
4388} 4389}
4389 4390
4390void CalendarView::openAddressbook() 4391void CalendarView::openAddressbook()
4391{ 4392{
4392 KRun::runCommand("kaddressbook"); 4393 KRun::runCommand("kaddressbook");
4393} 4394}
4394 4395
4395void CalendarView::setModified(bool modified) 4396void CalendarView::setModified(bool modified)
4396{ 4397{
4397 //qDebug("CalendarView::setModified %d ", modified); 4398 //qDebug("CalendarView::setModified %d ", modified);
4398 if ( modified ) 4399 if ( modified )
4399 emit signalmodified(); 4400 emit signalmodified();
4400 mModified = modified; 4401 mModified = modified;
4401 if ( mModified ) 4402 if ( mModified )
4402 emit modifiedChanged(mModified); 4403 emit modifiedChanged(mModified);
4403 4404
4404} 4405}
4405 4406
4406bool CalendarView::isReadOnly() 4407bool CalendarView::isReadOnly()
4407{ 4408{
4408 return mReadOnly; 4409 return mReadOnly;
4409} 4410}
4410 4411
4411void CalendarView::setReadOnly(bool readOnly) 4412void CalendarView::setReadOnly(bool readOnly)
4412{ 4413{
4413 if (mReadOnly != readOnly) { 4414 if (mReadOnly != readOnly) {
4414 mReadOnly = readOnly; 4415 mReadOnly = readOnly;
4415 emit readOnlyChanged(mReadOnly); 4416 emit readOnlyChanged(mReadOnly);
4416 } 4417 }
4417} 4418}
4418 4419
4419bool CalendarView::isModified() 4420bool CalendarView::isModified()
4420{ 4421{
4421 return mModified; 4422 return mModified;
4422} 4423}
4423void CalendarView::slotprintSelInc() 4424void CalendarView::slotprintSelInc()
4424{ 4425{
4425 if ( currentSelection() == 0 ) { 4426 if ( currentSelection() == 0 ) {
4426 KMessageBox::sorry(this,i18n("There is nothing selected!")); 4427 KMessageBox::sorry(this,i18n("There is nothing selected!"));
4427 return; 4428 return;
4428 } 4429 }
4429 showIncidence(); 4430 showIncidence();
4430 getEventViewerDialog()->print(); 4431 getEventViewerDialog()->print();
4431 4432
4432} 4433}
4433void CalendarView::printSetup() 4434void CalendarView::printSetup()
4434{ 4435{
4435#ifndef KORG_NOPRINTER 4436#ifndef KORG_NOPRINTER
4436 createPrinter(); 4437 createPrinter();
4437 4438
4438 mCalPrinter->setupPrinter(); 4439 mCalPrinter->setupPrinter();
4439#endif 4440#endif
4440} 4441}
4441 4442
4442void CalendarView::print() 4443void CalendarView::print()
4443{ 4444{
4444#ifndef KORG_NOPRINTER 4445#ifndef KORG_NOPRINTER
4445 createPrinter(); 4446 createPrinter();
4446 4447
4447 DateList tmpDateList = mNavigator->selectedDates(); 4448 DateList tmpDateList = mNavigator->selectedDates();
4448 mCalPrinter->print(CalPrinter::Month, 4449 mCalPrinter->print(CalPrinter::Month,
4449 tmpDateList.first(), tmpDateList.last()); 4450 tmpDateList.first(), tmpDateList.last());
4450#endif 4451#endif
4451} 4452}
4452 4453
4453void CalendarView::printPreview() 4454void CalendarView::printPreview()
4454{ 4455{
4455#ifndef KORG_NOPRINTER 4456#ifndef KORG_NOPRINTER
4456 kdDebug() << "CalendarView::printPreview()" << endl; 4457 kdDebug() << "CalendarView::printPreview()" << endl;
4457 4458
4458 createPrinter(); 4459 createPrinter();
4459 4460
4460 DateList tmpDateList = mNavigator->selectedDates(); 4461 DateList tmpDateList = mNavigator->selectedDates();
4461 4462
4462 mViewManager->currentView()->printPreview(mCalPrinter,tmpDateList.first(), 4463 mViewManager->currentView()->printPreview(mCalPrinter,tmpDateList.first(),
4463 tmpDateList.last()); 4464 tmpDateList.last());
4464#endif 4465#endif
4465} 4466}
4466 4467bool CalendarView::exportICalendar( QString filename )
4467void CalendarView::exportICalendar()
4468{ 4468{
4469 QString filename = KFileDialog::getSaveFileName("icalout.ics",i18n("*.ics|ICalendars"),this);
4470
4471 // Force correct extension 4469 // Force correct extension
4472 if (filename.right(4) != ".ics") filename += ".ics"; 4470 if (filename.right(4) != ".ics") filename += ".ics";
4473 4471
4474 FileStorage storage( mCalendar, filename, new ICalFormat() ); 4472 FileStorage storage( mCalendar, filename, new ICalFormat() );
4475 storage.save(); 4473 return storage.save();
4474}
4475
4476bool CalendarView::exportICalendar()
4477{
4478 return exportICalendar( KFileDialog::getSaveFileName("icalout.ics",i18n("*.ics|ICalendars"),this) );
4476} 4479}
4477 4480
4478bool CalendarView::exportVCalendar( QString filename ) 4481bool CalendarView::exportVCalendar( QString filename )
4479{ 4482{
4480 if (mCalendar->journals().count() > 0) { 4483 if (mCalendar->journals().count() > 0) {
4481 int result = KMessageBox::warningContinueCancel(this, 4484 int result = KMessageBox::warningContinueCancel(this,
4482 i18n("The journal entries can not be\nexported to a vCalendar file."), 4485 i18n("The journal entries can not be\nexported to a vCalendar file."),
4483 i18n("Data Loss Warning"),i18n("Proceed"),i18n("Cancel"), 4486 i18n("Data Loss Warning"),i18n("Proceed"),i18n("Cancel"),
4484 true); 4487 true);
4485 if (result != KMessageBox::Continue) return false; 4488 if (result != KMessageBox::Continue) return false;
4486 } 4489 }
4487 4490
4488 //QString filename = KFileDialog::getSaveFileName("vcalout.vcs",i18n("*.vcs|VCalendars"),this); 4491 //QString filename = KFileDialog::getSaveFileName("vcalout.vcs",i18n("*.vcs|VCalendars"),this);
4489 4492
4490 // Force correct extension 4493 // Force correct extension
4491 if (filename.right(4) != ".vcs") filename += ".vcs"; 4494 if (filename.right(4) != ".vcs") filename += ".vcs";
4492 4495
4493 FileStorage storage( mCalendar, filename, new VCalFormat ); 4496 FileStorage storage( mCalendar, filename, new VCalFormat );
4494 return storage.save(); 4497 return storage.save();
4495 4498
4496} 4499}
4497 4500
4498void CalendarView::eventUpdated(Incidence *) 4501void CalendarView::eventUpdated(Incidence *)
4499{ 4502{
4500 setModified(); 4503 setModified();
4501 // Don't call updateView here. The code, which has caused the update of the 4504 // Don't call updateView here. The code, which has caused the update of the
4502 // event is responsible for updating the view. 4505 // event is responsible for updating the view.
4503 // updateView(); 4506 // updateView();
4504} 4507}
4505 4508
4506void CalendarView::adaptNavigationUnits() 4509void CalendarView::adaptNavigationUnits()
4507{ 4510{
4508 if (mViewManager->currentView()->isEventView()) { 4511 if (mViewManager->currentView()->isEventView()) {
4509 int days = mViewManager->currentView()->currentDateCount(); 4512 int days = mViewManager->currentView()->currentDateCount();
4510 if (days == 1) { 4513 if (days == 1) {
4511 emit changeNavStringPrev(i18n("&Previous Day")); 4514 emit changeNavStringPrev(i18n("&Previous Day"));
4512 emit changeNavStringNext(i18n("&Next Day")); 4515 emit changeNavStringNext(i18n("&Next Day"));
4513 } else { 4516 } else {
4514 emit changeNavStringPrev(i18n("&Previous Week")); 4517 emit changeNavStringPrev(i18n("&Previous Week"));
4515 emit changeNavStringNext(i18n("&Next Week")); 4518 emit changeNavStringNext(i18n("&Next Week"));
4516 } 4519 }
4517 } 4520 }
4518} 4521}
4519 4522
4520void CalendarView::processMainViewSelection( Incidence *incidence ) 4523void CalendarView::processMainViewSelection( Incidence *incidence )
4521{ 4524{
4522 if ( incidence ) mTodoList->clearSelection(); 4525 if ( incidence ) mTodoList->clearSelection();
4523 processIncidenceSelection( incidence ); 4526 processIncidenceSelection( incidence );
4524} 4527}
4525 4528
4526void CalendarView::processTodoListSelection( Incidence *incidence ) 4529void CalendarView::processTodoListSelection( Incidence *incidence )
4527{ 4530{
4528 if ( incidence && mViewManager->currentView() ) { 4531 if ( incidence && mViewManager->currentView() ) {
4529 mViewManager->currentView()->clearSelection(); 4532 mViewManager->currentView()->clearSelection();
4530 } 4533 }
4531 processIncidenceSelection( incidence ); 4534 processIncidenceSelection( incidence );
4532} 4535}
4533 4536
4534void CalendarView::processIncidenceSelection( Incidence *incidence ) 4537void CalendarView::processIncidenceSelection( Incidence *incidence )
4535{ 4538{
4536 emit incidenceSelected( incidence ); 4539 emit incidenceSelected( incidence );
4537 if ( incidence == mSelectedIncidence ) return; 4540 if ( incidence == mSelectedIncidence ) return;
4538 mSelectedIncidence = incidence; 4541 mSelectedIncidence = incidence;
4539 4542
4540 if ( incidence && incidence->typeID() == eventID ) { 4543 if ( incidence && incidence->typeID() == eventID ) {
4541 Event *event = static_cast<Event *>( incidence ); 4544 Event *event = static_cast<Event *>( incidence );
4542 if ( event->organizer() == KOPrefs::instance()->email() ) { 4545 if ( event->organizer() == KOPrefs::instance()->email() ) {
4543 emit organizerEventsSelected( true ); 4546 emit organizerEventsSelected( true );
4544 } else { 4547 } else {
4545 emit organizerEventsSelected(false); 4548 emit organizerEventsSelected(false);
4546 } 4549 }
4547 if (event->attendeeByMails( KOPrefs::instance()->mAdditionalMails, 4550 if (event->attendeeByMails( KOPrefs::instance()->mAdditionalMails,
4548 KOPrefs::instance()->email() ) ) { 4551 KOPrefs::instance()->email() ) ) {
4549 emit groupEventsSelected( true ); 4552 emit groupEventsSelected( true );
4550 } else { 4553 } else {
4551 emit groupEventsSelected(false); 4554 emit groupEventsSelected(false);
4552 } 4555 }
4553 return; 4556 return;
4554 } else { 4557 } else {
4555 if ( incidence && incidence->typeID() == todoID ) { 4558 if ( incidence && incidence->typeID() == todoID ) {
4556 emit todoSelected( true ); 4559 emit todoSelected( true );
4557 Todo *event = static_cast<Todo *>( incidence ); 4560 Todo *event = static_cast<Todo *>( incidence );
4558 if ( event->organizer() == KOPrefs::instance()->email() ) { 4561 if ( event->organizer() == KOPrefs::instance()->email() ) {
4559 emit organizerEventsSelected( true ); 4562 emit organizerEventsSelected( true );
4560 } else { 4563 } else {
4561 emit organizerEventsSelected(false); 4564 emit organizerEventsSelected(false);
4562 } 4565 }
4563 if (event->attendeeByMails( KOPrefs::instance()->mAdditionalMails, 4566 if (event->attendeeByMails( KOPrefs::instance()->mAdditionalMails,
4564 KOPrefs::instance()->email() ) ) { 4567 KOPrefs::instance()->email() ) ) {
4565 emit groupEventsSelected( true ); 4568 emit groupEventsSelected( true );
4566 } else { 4569 } else {
4567 emit groupEventsSelected(false); 4570 emit groupEventsSelected(false);
4568 } 4571 }
4569 return; 4572 return;
4570 } else { 4573 } else {
4571 emit todoSelected( false ); 4574 emit todoSelected( false );
4572 emit organizerEventsSelected(false); 4575 emit organizerEventsSelected(false);
4573 emit groupEventsSelected(false); 4576 emit groupEventsSelected(false);
4574 } 4577 }
4575 return; 4578 return;
4576 } 4579 }
4577 4580
4578 /* if ( incidence && incidence->typeID() == todoID ) { 4581 /* if ( incidence && incidence->typeID() == todoID ) {
4579 emit todoSelected( true ); 4582 emit todoSelected( true );
4580 } else { 4583 } else {
4581 emit todoSelected( false ); 4584 emit todoSelected( false );
4582 }*/ 4585 }*/
4583} 4586}
4584 4587
4585 4588
4586void CalendarView::checkClipboard() 4589void CalendarView::checkClipboard()
4587{ 4590{
4588#ifndef KORG_NODND 4591#ifndef KORG_NODND
4589 if (ICalDrag::canDecode(QApplication::clipboard()->data())) { 4592 if (ICalDrag::canDecode(QApplication::clipboard()->data())) {
4590 emit pasteEnabled(true); 4593 emit pasteEnabled(true);
4591 } else { 4594 } else {
4592 emit pasteEnabled(false); 4595 emit pasteEnabled(false);
4593 } 4596 }
4594#endif 4597#endif
4595} 4598}
4596 4599
4597void CalendarView::showDates(const DateList &selectedDates) 4600void CalendarView::showDates(const DateList &selectedDates)
4598{ 4601{
4599 // kdDebug() << "CalendarView::selectDates()" << endl; 4602 // kdDebug() << "CalendarView::selectDates()" << endl;
4600 4603
4601 4604
4602 if ( !mBlockShowDates ) { 4605 if ( !mBlockShowDates ) {
4603 if ( mViewManager->currentView() ) { 4606 if ( mViewManager->currentView() ) {
4604 updateView( selectedDates.first(), selectedDates.last() ); 4607 updateView( selectedDates.first(), selectedDates.last() );
4605 } else { 4608 } else {
4606 mViewManager->showAgendaView(); 4609 mViewManager->showAgendaView();
4607 } 4610 }
4608 } 4611 }
4609 4612
4610 QDate date = selectedDates.first(); 4613 QDate date = selectedDates.first();
4611 if ( ! date.isValid() ) { 4614 if ( ! date.isValid() ) {
4612 topLevelWidget()->setCaption(""); 4615 topLevelWidget()->setCaption("");
4613 return; 4616 return;
4614 } 4617 }
4615 4618
4616 QString selDates; 4619 QString selDates;
4617 selDates = KGlobal::locale()->formatDate( date, true); 4620 selDates = KGlobal::locale()->formatDate( date, true);
4618 if (selectedDates.first() < selectedDates.last() ) 4621 if (selectedDates.first() < selectedDates.last() )
4619 selDates += " - " + KGlobal::locale()->formatDate( selectedDates.last(),true); 4622 selDates += " - " + KGlobal::locale()->formatDate( selectedDates.last(),true);
4620 else { 4623 else {
4621 QString addString; 4624 QString addString;
4622 if ( date == QDateTime::currentDateTime().date() ) 4625 if ( date == QDateTime::currentDateTime().date() )
4623 addString = i18n("Today"); 4626 addString = i18n("Today");
4624 else if ( date == QDateTime::currentDateTime().date().addDays(1) ) 4627 else if ( date == QDateTime::currentDateTime().date().addDays(1) )
4625 addString = i18n("Tomorrow"); 4628 addString = i18n("Tomorrow");
4626 else if ( date == QDateTime::currentDateTime().date().addDays(-1) ) 4629 else if ( date == QDateTime::currentDateTime().date().addDays(-1) )
4627 addString = i18n("Yesterday"); 4630 addString = i18n("Yesterday");
4628 else if ( date == QDateTime::currentDateTime().date().addDays(-2) ) 4631 else if ( date == QDateTime::currentDateTime().date().addDays(-2) )
4629 addString = i18n("Day before yesterday"); 4632 addString = i18n("Day before yesterday");
4630 else if ( date == QDateTime::currentDateTime().date().addDays(2) ) 4633 else if ( date == QDateTime::currentDateTime().date().addDays(2) )
4631 addString = i18n("Day after tomorrow"); 4634 addString = i18n("Day after tomorrow");
4632 if ( !addString.isEmpty() ) { 4635 if ( !addString.isEmpty() ) {
4633 topLevelWidget()->setCaption( addString+", " + selDates ); 4636 topLevelWidget()->setCaption( addString+", " + selDates );
4634 return; 4637 return;
4635 } 4638 }
4636 } 4639 }
4637 topLevelWidget()->setCaption( i18n("Dates: ") + selDates ); 4640 topLevelWidget()->setCaption( i18n("Dates: ") + selDates );
4638 4641
4639} 4642}
4640 4643
4641QPtrList<CalFilter> CalendarView::filters() 4644QPtrList<CalFilter> CalendarView::filters()
4642{ 4645{
4643 return mFilters; 4646 return mFilters;
4644 4647
4645} 4648}
4646void CalendarView::editFilters() 4649void CalendarView::editFilters()
4647{ 4650{
4648 // kdDebug() << "CalendarView::editFilters()" << endl; 4651 // kdDebug() << "CalendarView::editFilters()" << endl;
4649 4652
4650 CalFilter *filter = mFilters.first(); 4653 CalFilter *filter = mFilters.first();
4651 while(filter) { 4654 while(filter) {
4652 filter = mFilters.next(); 4655 filter = mFilters.next();
4653 } 4656 }
4654 4657
4655 mDialogManager->showFilterEditDialog(&mFilters); 4658 mDialogManager->showFilterEditDialog(&mFilters);
4656 updateFilter(); 4659 updateFilter();
4657} 4660}
4658void CalendarView::toggleFilter() 4661void CalendarView::toggleFilter()
4659{ 4662{
4660 if ( mLeftFrame->isHidden() ) { 4663 if ( mLeftFrame->isHidden() ) {
4661 toggleExpand(); 4664 toggleExpand();
4662 showFilter( true ); 4665 showFilter( true );
4663 } else 4666 } else
4664 showFilter(! mCalEditView->isVisible()); 4667 showFilter(! mCalEditView->isVisible());
4665} 4668}
4666 4669
4667KOFilterView *CalendarView::filterView() 4670KOFilterView *CalendarView::filterView()
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index b223315..8670832 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -187,385 +187,386 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
187 void pasteEnabled(bool); 187 void pasteEnabled(bool);
188 188
189 /** Emitted, when the number of incoming messages has changed. */ 189 /** Emitted, when the number of incoming messages has changed. */
190 void numIncomingChanged(int); 190 void numIncomingChanged(int);
191 191
192 /** Emitted, when the number of outgoing messages has changed. */ 192 /** Emitted, when the number of outgoing messages has changed. */
193 void numOutgoingChanged(int); 193 void numOutgoingChanged(int);
194 194
195 /** Send status message, which can e.g. be displayed in the status bar. */ 195 /** Send status message, which can e.g. be displayed in the status bar. */
196 void statusMessage(const QString &); 196 void statusMessage(const QString &);
197 197
198 void calendarViewExpanded( bool ); 198 void calendarViewExpanded( bool );
199 void updateSearchDialog(); 199 void updateSearchDialog();
200 void filtersUpdated(); 200 void filtersUpdated();
201 201
202 202
203 public slots: 203 public slots:
204 void nextConflict( bool all, bool allday ); 204 void nextConflict( bool all, bool allday );
205 void conflictAll(); 205 void conflictAll();
206 void conflictAllday(); 206 void conflictAllday();
207 void conflictNotAll(); 207 void conflictNotAll();
208 void setCalReadOnly( int id, bool readO ); 208 void setCalReadOnly( int id, bool readO );
209 void checkAlarms(); 209 void checkAlarms();
210 void checkFiles(); 210 void checkFiles();
211 void slotprintSelInc(); 211 void slotprintSelInc();
212 void showNextAlarms(); 212 void showNextAlarms();
213 void showOpenError(); 213 void showOpenError();
214 void watchSavedFile(); 214 void watchSavedFile();
215 void recheckTimerAlarm(); 215 void recheckTimerAlarm();
216 void checkNextTimerAlarm(); 216 void checkNextTimerAlarm();
217 void addAlarm(const QDateTime &qdt, const QString &noti ); 217 void addAlarm(const QDateTime &qdt, const QString &noti );
218 void addSuspendAlarm(const QDateTime &qdt, const QString &noti ); 218 void addSuspendAlarm(const QDateTime &qdt, const QString &noti );
219 void removeAlarm(const QDateTime &qdt, const QString &noti ); 219 void removeAlarm(const QDateTime &qdt, const QString &noti );
220 220
221 /** options dialog made a changed to the configuration. we catch this 221 /** options dialog made a changed to the configuration. we catch this
222 * and notify all widgets which need to update their configuration. */ 222 * and notify all widgets which need to update their configuration. */
223 void updateConfig(); 223 void updateConfig();
224 224
225 void insertBirthdays(const QString& uid, const QStringList& birthdayList, 225 void insertBirthdays(const QString& uid, const QStringList& birthdayList,
226 const QStringList& anniversaryList, const QStringList& realNameList, 226 const QStringList& anniversaryList, const QStringList& realNameList,
227 const QStringList& emailList, const QStringList& assembledNameList, 227 const QStringList& emailList, const QStringList& assembledNameList,
228 const QStringList& uidList); 228 const QStringList& uidList);
229 229
230 /** 230 /**
231 Load calendar from file \a filename. If \a merge is true, load 231 Load calendar from file \a filename. If \a merge is true, load
232 calendar into existing one, if it is false, clear calendar, before 232 calendar into existing one, if it is false, clear calendar, before
233 loading. Return true, if calendar could be successfully loaded. 233 loading. Return true, if calendar could be successfully loaded.
234 */ 234 */
235 bool openCalendar(QString filename, bool merge=false); 235 bool openCalendar(QString filename, bool merge=false);
236 bool loadCalendars(); 236 bool loadCalendars();
237 bool saveCalendars(); 237 bool saveCalendars();
238 bool restoreCalendarSettings(); 238 bool restoreCalendarSettings();
239 bool addCalendar( KopiCalendarFile * ); 239 bool addCalendar( KopiCalendarFile * );
240 void addCalendarId( int id ); 240 void addCalendarId( int id );
241 bool syncCalendar(QString filename,int mode = 0 ); 241 bool syncCalendar(QString filename,int mode = 0 );
242 242
243 /** 243 /**
244 Save calendar data to file. Return true if calendar could be 244 Save calendar data to file. Return true if calendar could be
245 successfully saved. 245 successfully saved.
246 */ 246 */
247 bool saveCalendar(QString filename); 247 bool saveCalendar(QString filename);
248 248
249 /** 249 /**
250 Close calendar. Clear calendar data and reset views to display an empty 250 Close calendar. Clear calendar data and reset views to display an empty
251 calendar. 251 calendar.
252 */ 252 */
253 void closeCalendar(); 253 void closeCalendar();
254 254
255 /** Archive old events of calendar */ 255 /** Archive old events of calendar */
256 void archiveCalendar(); 256 void archiveCalendar();
257 257
258 void showIncidence(); 258 void showIncidence();
259 void editIncidence(); 259 void editIncidence();
260 void editIncidenceDescription(); 260 void editIncidenceDescription();
261 void deleteIncidence(); 261 void deleteIncidence();
262 void cloneIncidence(); 262 void cloneIncidence();
263 void moveIncidence(); 263 void moveIncidence();
264 void beamIncidence(); 264 void beamIncidence();
265 void toggleCancelIncidence(); 265 void toggleCancelIncidence();
266 266
267 /** create an editeventwin with supplied date/time, and if bool is true, 267 /** create an editeventwin with supplied date/time, and if bool is true,
268 * make the event take all day. */ 268 * make the event take all day. */
269 void newEvent(QDateTime, QDateTime, bool allDay ); 269 void newEvent(QDateTime, QDateTime, bool allDay );
270 void newEvent(QDateTime, QDateTime); 270 void newEvent(QDateTime, QDateTime);
271 void newEvent(QDateTime fh); 271 void newEvent(QDateTime fh);
272 void newEvent(QDate dt); 272 void newEvent(QDate dt);
273 /** create new event without having a date hint. Takes current date as 273 /** create new event without having a date hint. Takes current date as
274 default hint. */ 274 default hint. */
275 void newEvent(); 275 void newEvent();
276 void newFloatingEvent(); 276 void newFloatingEvent();
277 277
278 /** Create a read-only viewer dialog for the supplied incidence. It calls the correct showXXX method*/ 278 /** Create a read-only viewer dialog for the supplied incidence. It calls the correct showXXX method*/
279 void showIncidence(Incidence *); 279 void showIncidence(Incidence *);
280 void showIncidence(QString uid); 280 void showIncidence(QString uid);
281 /** Create an editor for the supplied incidence. It calls the correct editXXX method*/ 281 /** Create an editor for the supplied incidence. It calls the correct editXXX method*/
282 void editIncidence(Incidence *); 282 void editIncidence(Incidence *);
283 /** Delete the supplied incidence. It calls the correct deleteXXX method*/ 283 /** Delete the supplied incidence. It calls the correct deleteXXX method*/
284 void deleteIncidence(Incidence *); 284 void deleteIncidence(Incidence *);
285 void cloneIncidence(Incidence *); 285 void cloneIncidence(Incidence *);
286 void cancelIncidence(Incidence *); 286 void cancelIncidence(Incidence *);
287 /** Create an editor for the supplied event. */ 287 /** Create an editor for the supplied event. */
288 void editEvent(Event *); 288 void editEvent(Event *);
289 /** Delete the supplied event. */ 289 /** Delete the supplied event. */
290 void deleteEvent(Event *); 290 void deleteEvent(Event *);
291 /** Delete the event with the given unique ID. Returns false, if event wasn't 291 /** Delete the event with the given unique ID. Returns false, if event wasn't
292 found. */ 292 found. */
293 bool deleteEvent(const QString &uid); 293 bool deleteEvent(const QString &uid);
294 /** Create a read-only viewer dialog for the supplied event. */ 294 /** Create a read-only viewer dialog for the supplied event. */
295 void showEvent(Event *); 295 void showEvent(Event *);
296 296
297 void editJournal(Journal *); 297 void editJournal(Journal *);
298 void showJournal(Journal *); 298 void showJournal(Journal *);
299 void deleteJournal(Journal *); 299 void deleteJournal(Journal *);
300 /** Create an editor dialog for a todo */ 300 /** Create an editor dialog for a todo */
301 void editTodo(Todo *); 301 void editTodo(Todo *);
302 /** Create a read-only viewer dialog for the supplied todo */ 302 /** Create a read-only viewer dialog for the supplied todo */
303 void showTodo(Todo *); 303 void showTodo(Todo *);
304 /** create new todo */ 304 /** create new todo */
305 void newTodo(); 305 void newTodo();
306 void newTodoDateTime(QDateTime, bool allday); 306 void newTodoDateTime(QDateTime, bool allday);
307 /** create new todo with a parent todo */ 307 /** create new todo with a parent todo */
308 void newSubTodo(); 308 void newSubTodo();
309 /** create new todo with a parent todo */ 309 /** create new todo with a parent todo */
310 void newSubTodo(Todo *); 310 void newSubTodo(Todo *);
311 /** Delete todo */ 311 /** Delete todo */
312 void deleteTodo(Todo *); 312 void deleteTodo(Todo *);
313 313
314 314
315 /** Check if clipboard contains vCalendar event. The signal pasteEnabled() is 315 /** Check if clipboard contains vCalendar event. The signal pasteEnabled() is
316 * emitted as result. */ 316 * emitted as result. */
317 void checkClipboard(); 317 void checkClipboard();
318 318
319 /** using the KConfig associated with the kapp variable, read in the 319 /** using the KConfig associated with the kapp variable, read in the
320 * settings from the config file. 320 * settings from the config file.
321 */ 321 */
322 void readSettings(); 322 void readSettings();
323 323
324 /** write current state to config file. */ 324 /** write current state to config file. */
325 void writeSettings(); 325 void writeSettings();
326 326
327 /** read settings for calendar filters */ 327 /** read settings for calendar filters */
328 void readFilterSettings(KConfig *config); 328 void readFilterSettings(KConfig *config);
329 329
330 /** write settings for calendar filters */ 330 /** write settings for calendar filters */
331 void writeFilterSettings(KConfig *config); 331 void writeFilterSettings(KConfig *config);
332 332
333 /** passes on the message that an event has changed to the currently 333 /** passes on the message that an event has changed to the currently
334 * activated view so that it can make appropriate display changes. */ 334 * activated view so that it can make appropriate display changes. */
335 void changeEventDisplay(Event *, int); 335 void changeEventDisplay(Event *, int);
336 void changeIncidenceDisplay(Incidence *, int); 336 void changeIncidenceDisplay(Incidence *, int);
337 void changeTodoDisplay(Todo *, int); 337 void changeTodoDisplay(Todo *, int);
338 338
339 void eventAdded(Event *); 339 void eventAdded(Event *);
340 void eventChanged(Event *); 340 void eventChanged(Event *);
341 void eventToBeDeleted(Event *); 341 void eventToBeDeleted(Event *);
342 void eventDeleted(); 342 void eventDeleted();
343 343
344 void todoAdded(Todo *); 344 void todoAdded(Todo *);
345 void todoChanged(Todo *); 345 void todoChanged(Todo *);
346 void todoToBeDeleted(Todo *); 346 void todoToBeDeleted(Todo *);
347 void todoDeleted(); 347 void todoDeleted();
348 348
349 void updateView(const QDate &start, const QDate &end); 349 void updateView(const QDate &start, const QDate &end);
350 void updateView(); 350 void updateView();
351 void clearAllViews(); 351 void clearAllViews();
352 352
353 /** Full update of visible todo views */ 353 /** Full update of visible todo views */
354 void updateTodoViews(); 354 void updateTodoViews();
355 355
356 void updateUnmanagedViews(); 356 void updateUnmanagedViews();
357 357
358 /** cut the current appointment to the clipboard */ 358 /** cut the current appointment to the clipboard */
359 void edit_cut(); 359 void edit_cut();
360 360
361 /** copy the current appointment(s) to the clipboard */ 361 /** copy the current appointment(s) to the clipboard */
362 void edit_copy(); 362 void edit_copy();
363 363
364 /** paste the current vobject(s) in the clipboard buffer into calendar */ 364 /** paste the current vobject(s) in the clipboard buffer into calendar */
365 void edit_paste(); 365 void edit_paste();
366 366
367 /** edit viewing and configuration options. */ 367 /** edit viewing and configuration options. */
368 void edit_options(); 368 void edit_options();
369 void edit_global_options(); 369 void edit_global_options();
370 /** 370 /**
371 Functions for printing, previewing a print, and setting up printing 371 Functions for printing, previewing a print, and setting up printing
372 parameters. 372 parameters.
373 */ 373 */
374 void print(); 374 void print();
375 void printSetup(); 375 void printSetup();
376 void printPreview(); 376 void printPreview();
377 377
378 /** Export as iCalendar file */ 378 /** Export as iCalendar file */
379 void exportICalendar(); 379 bool exportICalendar();
380 bool exportICalendar( QString fn );
380 381
381 /** Export as vCalendar file */ 382 /** Export as vCalendar file */
382 bool exportVCalendar( QString fn); 383 bool exportVCalendar( QString fn);
383 384
384 /** pop up a dialog to show an existing appointment. */ 385 /** pop up a dialog to show an existing appointment. */
385 void appointment_show(); 386 void appointment_show();
386 /** 387 /**
387 * pop up an Appointment Dialog to edit an existing appointment.Get 388 * pop up an Appointment Dialog to edit an existing appointment.Get
388 * information on the appointment from the list of unique IDs that is 389 * information on the appointment from the list of unique IDs that is
389 * currently in the View, called currIds. 390 * currently in the View, called currIds.
390 */ 391 */
391 void appointment_edit(); 392 void appointment_edit();
392 /** 393 /**
393 * pop up dialog confirming deletion of currently selected event in the 394 * pop up dialog confirming deletion of currently selected event in the
394 * View. 395 * View.
395 */ 396 */
396 void appointment_delete(); 397 void appointment_delete();
397 398
398 /** mails the currently selected event to a particular user as a vCalendar 399 /** mails the currently selected event to a particular user as a vCalendar
399 attachment. */ 400 attachment. */
400 void action_mail(); 401 void action_mail();
401 402
402 /* frees a subtodo from it's relation */ 403 /* frees a subtodo from it's relation */
403 void todo_unsub( Todo * ); 404 void todo_unsub( Todo * );
404 void todo_resub( Todo * parent, Todo * sub ); 405 void todo_resub( Todo * parent, Todo * sub );
405 406
406 /** Take ownership of selected event. */ 407 /** Take ownership of selected event. */
407 void takeOverEvent(); 408 void takeOverEvent();
408 409
409 /** Take ownership of all events in calendar. */ 410 /** Take ownership of all events in calendar. */
410 void takeOverCalendar(); 411 void takeOverCalendar();
411 412
412 /** query whether or not the calendar is "dirty". */ 413 /** query whether or not the calendar is "dirty". */
413 bool isModified(); 414 bool isModified();
414 /** set the state of calendar. Modified means "dirty", i.e. needing a save. */ 415 /** set the state of calendar. Modified means "dirty", i.e. needing a save. */
415 void setModified(bool modified=true); 416 void setModified(bool modified=true);
416 417
417 /** query if the calendar is read-only. */ 418 /** query if the calendar is read-only. */
418 bool isReadOnly(); 419 bool isReadOnly();
419 /** set state of calendar to read-only */ 420 /** set state of calendar to read-only */
420 void setReadOnly(bool readOnly=true); 421 void setReadOnly(bool readOnly=true);
421 422
422 void eventUpdated(Incidence *); 423 void eventUpdated(Incidence *);
423 424
424 /* iTIP scheduling actions */ 425 /* iTIP scheduling actions */
425 void schedule_publish(Incidence *incidence = 0); 426 void schedule_publish(Incidence *incidence = 0);
426 void schedule_request(Incidence *incidence = 0); 427 void schedule_request(Incidence *incidence = 0);
427 void schedule_refresh(Incidence *incidence = 0); 428 void schedule_refresh(Incidence *incidence = 0);
428 void schedule_cancel(Incidence *incidence = 0); 429 void schedule_cancel(Incidence *incidence = 0);
429 void schedule_add(Incidence *incidence = 0); 430 void schedule_add(Incidence *incidence = 0);
430 void schedule_reply(Incidence *incidence = 0); 431 void schedule_reply(Incidence *incidence = 0);
431 void schedule_counter(Incidence *incidence = 0); 432 void schedule_counter(Incidence *incidence = 0);
432 void schedule_declinecounter(Incidence *incidence = 0); 433 void schedule_declinecounter(Incidence *incidence = 0);
433 void schedule_publish_freebusy(int daysToPublish = 30); 434 void schedule_publish_freebusy(int daysToPublish = 30);
434 435
435 void openAddressbook(); 436 void openAddressbook();
436 437
437 void editFilters(); 438 void editFilters();
438 void toggleFilerEnabled(); 439 void toggleFilerEnabled();
439 QPtrList<CalFilter> filters(); 440 QPtrList<CalFilter> filters();
440 void toggleFilter(); 441 void toggleFilter();
441 void showFilter(bool visible); 442 void showFilter(bool visible);
442 void updateFilter(); 443 void updateFilter();
443 void filterEdited(); 444 void filterEdited();
444 void selectFilter( int ); 445 void selectFilter( int );
445 KOFilterView *filterView(); 446 KOFilterView *filterView();
446 447
447 void showIntro(); 448 void showIntro();
448 449
449 /** Move the curdatepient view date to today */ 450 /** Move the curdatepient view date to today */
450 void goToday(); 451 void goToday();
451 452
452 /** Move to the next date(s) in the current view */ 453 /** Move to the next date(s) in the current view */
453 void goNext(); 454 void goNext();
454 455
455 /** Move to the previous date(s) in the current view */ 456 /** Move to the previous date(s) in the current view */
456 void goPrevious(); 457 void goPrevious();
457 /** Move to the next date(s) in the current view */ 458 /** Move to the next date(s) in the current view */
458 void goNextMonth(); 459 void goNextMonth();
459 460
460 /** Move to the previous date(s) in the current view */ 461 /** Move to the previous date(s) in the current view */
461 void goPreviousMonth(); 462 void goPreviousMonth();
462 463
463 void toggleExpand(); 464 void toggleExpand();
464 void toggleDateNavigatorWidget(); 465 void toggleDateNavigatorWidget();
465 void toggleAllDaySize(); 466 void toggleAllDaySize();
466 467
467 /** Look for new messages in the inbox */ 468 /** Look for new messages in the inbox */
468 void lookForIncomingMessages(); 469 void lookForIncomingMessages();
469 /** Look for new messages in the outbox */ 470 /** Look for new messages in the outbox */
470 void lookForOutgoingMessages(); 471 void lookForOutgoingMessages();
471 472
472 void processMainViewSelection( Incidence * ); 473 void processMainViewSelection( Incidence * );
473 void processTodoListSelection( Incidence * ); 474 void processTodoListSelection( Incidence * );
474 475
475 void processIncidenceSelection( Incidence * ); 476 void processIncidenceSelection( Incidence * );
476 477
477 void purgeCompleted(); 478 void purgeCompleted();
478 bool removeCompletedSubTodos( Todo* ); 479 bool removeCompletedSubTodos( Todo* );
479 void slotCalendarChanged(); 480 void slotCalendarChanged();
480 bool importBday(); 481 bool importBday();
481 bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday ); 482 bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday );
482 bool importQtopia( const QString &categoriesFile, 483 bool importQtopia( const QString &categoriesFile,
483 const QString &datebookFile, 484 const QString &datebookFile,
484 const QString &tasklistFile ); 485 const QString &tasklistFile );
485 void syncExternal( int mode ); 486 void syncExternal( int mode );
486 void slotSelectPickerDate( QDate ) ; 487 void slotSelectPickerDate( QDate ) ;
487 void showDatePicker() ; 488 void showDatePicker() ;
488 void showDatePickerPopup() ; 489 void showDatePickerPopup() ;
489 void moveIncidence(Incidence *) ; 490 void moveIncidence(Incidence *) ;
490 void beamIncidence(Incidence *) ; 491 void beamIncidence(Incidence *) ;
491 void beamCalendar() ; 492 void beamCalendar() ;
492 void beamFilteredCalendar() ; 493 void beamFilteredCalendar() ;
493 void beamIncidenceList(QPtrList<Incidence>) ; 494 void beamIncidenceList(QPtrList<Incidence>) ;
494 void manageCategories(); 495 void manageCategories();
495 void editCategories(); 496 void editCategories();
496 int addCategories(); 497 int addCategories();
497 void removeCategories(); 498 void removeCategories();
498 void setSyncDevice( QString ); 499 void setSyncDevice( QString );
499 void setSyncName( QString ); 500 void setSyncName( QString );
500 void showDay( QDate ); 501 void showDay( QDate );
501 void undo_delete(); 502 void undo_delete();
502 protected slots: 503 protected slots:
503 void resetFocus(); 504 void resetFocus();
504 void scrollBarValue(int); 505 void scrollBarValue(int);
505 void slotViewerClosed(); 506 void slotViewerClosed();
506 void timerAlarm(); 507 void timerAlarm();
507 void suspendAlarm(); 508 void suspendAlarm();
508 void beamDone( Ir *ir ); 509 void beamDone( Ir *ir );
509 /** Select a view or adapt the current view to display the specified dates. */ 510 /** Select a view or adapt the current view to display the specified dates. */
510 void showDates( const KCal::DateList & ); 511 void showDates( const KCal::DateList & );
511 void selectWeekNum ( int ); 512 void selectWeekNum ( int );
512 void checkConflictForEvent(); 513 void checkConflictForEvent();
513 514
514 public: 515 public:
515 void createRunningDate4Todo( Todo * runT, QDateTime start , QDateTime end, int secLenRunning, int secLenPausing,int dayInterval ); 516 void createRunningDate4Todo( Todo * runT, QDateTime start , QDateTime end, int secLenRunning, int secLenPausing,int dayInterval );
516 // show a standard warning 517 // show a standard warning
517 // returns KMsgBox::yesNoCancel() 518 // returns KMsgBox::yesNoCancel()
518 int msgCalModified(); 519 int msgCalModified();
519 virtual bool sync(KSyncManager* manager, QString filename, int mode); 520 virtual bool sync(KSyncManager* manager, QString filename, int mode);
520 521
521 virtual bool syncExternal(KSyncManager* manager, QString resource); 522 virtual bool syncExternal(KSyncManager* manager, QString resource);
522 virtual void removeSyncInfo( QString syncProfile); 523 virtual void removeSyncInfo( QString syncProfile);
523 void setSyncManager(KSyncManager* manager); 524 void setSyncManager(KSyncManager* manager);
524 void setLoadedFileVersion(QDateTime); 525 void setLoadedFileVersion(QDateTime);
525 bool checkFileVersion(QString fn); 526 bool checkFileVersion(QString fn);
526 bool checkAllFileVersions(); 527 bool checkAllFileVersions();
527 bool checkFileChanged(QString fn); 528 bool checkFileChanged(QString fn);
528 Event* getLastSyncEvent(); 529 Event* getLastSyncEvent();
529 /** Adapt navigation units correpsonding to step size of navigation of the 530 /** Adapt navigation units correpsonding to step size of navigation of the
530 * current view. 531 * current view.
531 */ 532 */
532 void adaptNavigationUnits(); 533 void adaptNavigationUnits();
533 bool synchronizeCalendar( Calendar* local, Calendar* remote, int mode ); 534 bool synchronizeCalendar( Calendar* local, Calendar* remote, int mode );
534 int takeEvent( Incidence* local, Incidence* remote, int mode, bool full = false ); 535 int takeEvent( Incidence* local, Incidence* remote, int mode, bool full = false );
535 //Attendee* getYourAttendee(Event *event); 536 //Attendee* getYourAttendee(Event *event);
536 void setBlockShowDates( bool b ) { mBlockShowDates = b ;} 537 void setBlockShowDates( bool b ) { mBlockShowDates = b ;}
537 void setScrollBarStep(int val ); 538 void setScrollBarStep(int val );
538 539
539 protected: 540 protected:
540 Event *mConflictingEvent; 541 Event *mConflictingEvent;
541 void schedule(Scheduler::Method, Incidence *incidence = 0); 542 void schedule(Scheduler::Method, Incidence *incidence = 0);
542 543
543 // returns KMsgBox::OKCandel() 544 // returns KMsgBox::OKCandel()
544 int msgItemDelete(const QString name); 545 int msgItemDelete(const QString name);
545 void showEventEditor(); 546 void showEventEditor();
546 void showTodoEditor(); 547 void showTodoEditor();
547 Todo *selectedTodo(); 548 Todo *selectedTodo();
548 private: 549 private:
549#ifdef DESKTOP_VERSION 550#ifdef DESKTOP_VERSION
550 QScrollBar * mDateScrollBar; 551 QScrollBar * mDateScrollBar;
551#endif 552#endif
552 QDateTime mNextAlarmDateTime; 553 QDateTime mNextAlarmDateTime;
553 bool mViewerCallerIsSearchDialog; 554 bool mViewerCallerIsSearchDialog;
554 bool mBlockShowDates; 555 bool mBlockShowDates;
555 KSyncManager* mSyncManager; 556 KSyncManager* mSyncManager;
556 AlarmDialog * mAlarmDialog; 557 AlarmDialog * mAlarmDialog;
557 QString mAlarmNotification; 558 QString mAlarmNotification;
558 QString mSuspendAlarmNotification; 559 QString mSuspendAlarmNotification;
559 QTimer* mSuspendTimer; 560 QTimer* mSuspendTimer;
560 QTimer* mAlarmTimer; 561 QTimer* mAlarmTimer;
561 QTimer* mRecheckAlarmTimer; 562 QTimer* mRecheckAlarmTimer;
562 void computeAlarm( QString ); 563 void computeAlarm( QString );
563 void startAlarm( QString, QString ); 564 void startAlarm( QString, QString );
564 void setSyncEventsReadOnly(); 565 void setSyncEventsReadOnly();
565 566
566 QDateTime loadedFileVersion; 567 QDateTime loadedFileVersion;
567 void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ); 568 void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete );
568 void checkExternalId( Incidence * inc ); 569 void checkExternalId( Incidence * inc );
569 int mGlobalSyncMode; 570 int mGlobalSyncMode;
570 QString mCurrentSyncDevice; 571 QString mCurrentSyncDevice;
571 QString mCurrentSyncName; 572 QString mCurrentSyncName;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 2af605f..98d3e35 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -334,408 +334,427 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
334 KMessageBox::information( this, message); 334 KMessageBox::information( this, message);
335 mView->openCalendar( oldFile ); 335 mView->openCalendar( oldFile );
336 qApp->processEvents(); 336 qApp->processEvents();
337 } else { 337 } else {
338 oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); 338 oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics");
339 finfo.setFile( oldFile ); 339 finfo.setFile( oldFile );
340 if (finfo.exists() ) { 340 if (finfo.exists() ) {
341 KMessageBox::information( this, message); 341 KMessageBox::information( this, message);
342 mView->openCalendar( oldFile ); 342 mView->openCalendar( oldFile );
343 qApp->processEvents(); 343 qApp->processEvents();
344 } 344 }
345 } 345 }
346 mView->saveCalendar( defaultFileName() ); 346 mView->saveCalendar( defaultFileName() );
347 newFile = true; 347 newFile = true;
348 } 348 }
349 349
350 //QTime neededSaveTime = QDateTime::currentDateTime().time(); 350 //QTime neededSaveTime = QDateTime::currentDateTime().time();
351 //mView->loadCalendars(); 351 //mView->loadCalendars();
352 //int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); 352 //int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
353 //qDebug("KO: Calendar loading time: %d ms",msNeeded ); 353 //qDebug("KO: Calendar loading time: %d ms",msNeeded );
354 354
355 if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { 355 if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
356 KOPrefs::instance()->setAllDefaults(); 356 KOPrefs::instance()->setAllDefaults();
357 } 357 }
358 358
359 359
360 connect( mView, SIGNAL( tempDisableBR(bool) ), 360 connect( mView, SIGNAL( tempDisableBR(bool) ),
361 SLOT( disableBR(bool) ) ); 361 SLOT( disableBR(bool) ) );
362 connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); 362 connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
363 setCentralWidget( mView ); 363 setCentralWidget( mView );
364 globalFlagBlockStartup = 0; 364 globalFlagBlockStartup = 0;
365 //mView->show(); 365 //mView->show();
366 //delete splash; 366 //delete splash;
367 if ( newFile ) 367 if ( newFile )
368 mView->updateConfig(); 368 mView->updateConfig();
369 // qApp->processEvents(); 369 // qApp->processEvents();
370 //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); 370 //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ());
371 //fillSyncMenu(); 371 //fillSyncMenu();
372 372
373 373
374 connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); 374 connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
375 connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); 375 connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) );
376 connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); 376 connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
377 connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); 377 connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
378 mSyncManager->setDefaultFileName( sentSyncFile()); 378 mSyncManager->setDefaultFileName( sentSyncFile());
379 connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); 379 connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
380 mSyncManager->fillSyncMenu(); 380 mSyncManager->fillSyncMenu();
381 381
382 382
383 383
384 mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); 384 mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins );
385 if ( showWarning ) { 385 if ( showWarning ) {
386 KMessageBox::information( this, 386 KMessageBox::information( this,
387 "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); 387 "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information");
388 qApp->processEvents(); 388 qApp->processEvents();
389 mView->dialogManager()->showSyncOptions(); 389 mView->dialogManager()->showSyncOptions();
390 } 390 }
391 391
392 //US listen for result adressed from Ka/Pi 392 //US listen for result adressed from Ka/Pi
393 393
394#ifndef DESKTOP_VERSION 394#ifndef DESKTOP_VERSION
395 infrared = 0; 395 infrared = 0;
396#endif 396#endif
397 updateFilterToolbar(); 397 updateFilterToolbar();
398 updateWeek( mView->startDate() ); 398 updateWeek( mView->startDate() );
399 connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), 399 connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
400 SLOT( updateWeekNum( const KCal::DateList & ) ) ); 400 SLOT( updateWeekNum( const KCal::DateList & ) ) );
401 mBRdisabled = false; 401 mBRdisabled = false;
402 //toggleBeamReceive(); 402 //toggleBeamReceive();
403 403
404 setCaption(i18n("Loading calendar files ... please wait" )); 404 setCaption(i18n("Loading calendar files ... please wait" ));
405 mSaveDelay = 0; 405 mSaveDelay = 0;
406 QTimer::singleShot( 1, this, SLOT ( loadDataAfterStart() )); 406 QTimer::singleShot( 1, this, SLOT ( loadDataAfterStart() ));
407} 407}
408MainWindow::~MainWindow() 408MainWindow::~MainWindow()
409{ 409{
410 //qDebug("MainWindow::~MainWindow() "); 410 //qDebug("MainWindow::~MainWindow() ");
411 //save toolbar location 411 //save toolbar location
412 delete mCalendar; 412 delete mCalendar;
413 delete mSyncManager; 413 delete mSyncManager;
414#ifndef DESKTOP_VERSION 414#ifndef DESKTOP_VERSION
415 if ( infrared ) 415 if ( infrared )
416 delete infrared; 416 delete infrared;
417#endif 417#endif
418 418
419 419
420} 420}
421 421
422void MainWindow::loadDataAfterStart() 422void MainWindow::loadDataAfterStart()
423{ 423{
424 424
425 qDebug("KO: Start loading files..." ); 425 qDebug("KO: Start loading files..." );
426 QTime neededSaveTime = QDateTime::currentDateTime().time(); 426 QTime neededSaveTime = QDateTime::currentDateTime().time();
427 mView->loadCalendars(); 427 mView->loadCalendars();
428 int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); 428 int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
429 qDebug("KO: Calendar loading time: %d ms",msNeeded ); 429 qDebug("KO: Calendar loading time: %d ms",msNeeded );
430 //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); 430 //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
431 mView->setModified( false ); 431 mView->setModified( false );
432 mBlockAtStartup = false; 432 mBlockAtStartup = false;
433 mView->setModified( false ); 433 mView->setModified( false );
434 connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); 434 connect(mView , SIGNAL( save() ), this, SLOT( save() ) );
435 processIncidenceSelection( 0 ); 435 processIncidenceSelection( 0 );
436 connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), 436 connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
437 SLOT( processIncidenceSelection( Incidence * ) ) ); 437 SLOT( processIncidenceSelection( Incidence * ) ) );
438 connect( mView, SIGNAL( modifiedChanged( bool ) ), 438 connect( mView, SIGNAL( modifiedChanged( bool ) ),
439 SLOT( slotModifiedChanged( bool ) ) ); 439 SLOT( slotModifiedChanged( bool ) ) );
440 440
441#ifndef DESKTOP_VERSION 441#ifndef DESKTOP_VERSION
442 connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); 442 connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
443 connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& ))); 443 connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& )));
444 disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& ))); 444 disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& )));
445 if ( !mCStringMess.isEmpty() ) 445 if ( !mCStringMess.isEmpty() )
446 recieve( mCStringMess, mByteData ); 446 recieve( mCStringMess, mByteData );
447#endif 447#endif
448 448
449 449
450 QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); 450 QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
451} 451}
452 452
453void MainWindow::slotResetFocus() 453void MainWindow::slotResetFocus()
454{ 454{
455 //qDebug(" CalendarView::slotResetFocus() %x %x %x %x", qApp->focusWidget(), menuBar1, mView,iconToolBar); 455 //qDebug(" CalendarView::slotResetFocus() %x %x %x %x", qApp->focusWidget(), menuBar1, mView,iconToolBar);
456 mFocusLoop = 3; 456 mFocusLoop = 3;
457 QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() )); 457 QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() ));
458} 458}
459void MainWindow::slotResetFocusLoop() 459void MainWindow::slotResetFocusLoop()
460{ 460{
461 --mFocusLoop; 461 --mFocusLoop;
462 QWidget* fw = mView->viewManager()->currentView(); 462 QWidget* fw = mView->viewManager()->currentView();
463 if ( fw ) { 463 if ( fw ) {
464 //qDebug("loop "); 464 //qDebug("loop ");
465 fw->setFocus(); 465 fw->setFocus();
466 if ( qApp->focusWidget() != fw && mFocusLoop > 0 ) 466 if ( qApp->focusWidget() != fw && mFocusLoop > 0 )
467 QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() )); 467 QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() ));
468 } 468 }
469 469
470} 470}
471void MainWindow::disableBR(bool b) 471void MainWindow::disableBR(bool b)
472{ 472{
473#ifndef DESKTOP_VERSION 473#ifndef DESKTOP_VERSION
474 if ( b ) { 474 if ( b ) {
475 if ( infrared ) { 475 if ( infrared ) {
476 toggleBeamReceive(); 476 toggleBeamReceive();
477 mBRdisabled = true; 477 mBRdisabled = true;
478 } 478 }
479 mBRdisabled = true; 479 mBRdisabled = true;
480 } else { 480 } else {
481 if ( mBRdisabled ) { 481 if ( mBRdisabled ) {
482 mBRdisabled = false; 482 mBRdisabled = false;
483 //makes no sense,because other cal ap is probably running 483 //makes no sense,because other cal ap is probably running
484 // toggleBeamReceive(); 484 // toggleBeamReceive();
485 } 485 }
486 } 486 }
487#endif 487#endif
488 488
489} 489}
490bool MainWindow::beamReceiveEnabled() 490bool MainWindow::beamReceiveEnabled()
491{ 491{
492#ifndef DESKTOP_VERSION 492#ifndef DESKTOP_VERSION
493 return ( infrared != 0 ); 493 return ( infrared != 0 );
494#endif 494#endif
495 return false; 495 return false;
496} 496}
497 497
498void MainWindow::toggleBeamReceive() 498void MainWindow::toggleBeamReceive()
499{ 499{
500 if ( mBRdisabled ) 500 if ( mBRdisabled )
501 return; 501 return;
502#ifndef DESKTOP_VERSION 502#ifndef DESKTOP_VERSION
503 if ( infrared ) { 503 if ( infrared ) {
504 qDebug("KO: Disable BeamReceive "); 504 qDebug("KO: Disable BeamReceive ");
505 delete infrared; 505 delete infrared;
506 infrared = 0; 506 infrared = 0;
507 brAction->setOn(false); 507 brAction->setOn(false);
508 return; 508 return;
509 } 509 }
510 qDebug("KO: Enable BeamReceive "); 510 qDebug("KO: Enable BeamReceive ");
511 brAction->setOn(true); 511 brAction->setOn(true);
512 infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ; 512 infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;
513 QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve( const QCString&, const QByteArray& ))); 513 QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve( const QCString&, const QByteArray& )));
514#endif 514#endif
515} 515}
516void MainWindow::showMaximized () 516void MainWindow::showMaximized ()
517{ 517{
518#ifndef DESKTOP_VERSION 518#ifndef DESKTOP_VERSION
519 if ( ! globalFlagBlockStartup ) 519 if ( ! globalFlagBlockStartup )
520 if ( mClosed ) 520 if ( mClosed )
521 mView->goToday(); 521 mView->goToday();
522#endif 522#endif
523 QWidget::showMaximized () ; 523 QWidget::showMaximized () ;
524 mClosed = false; 524 mClosed = false;
525} 525}
526
527bool MainWindow::askForQuitOnSaveError()
528{
529 bool retval = false;
530 switch( QMessageBox::information( this, "KO/Pi",
531 i18n("Error saving data") + "!\n" +
532 i18n("You can save all data\nto another file via\nFile->Export->Export All Data") + "!\n" +
533 i18n("Do you really want\nto close KO/Pi?"),
534 i18n(" Yes, close "), i18n("No"),
535 0, 1 ) ) {
536 case 0:
537 retval = true;
538 break;
539 default:
540 break;
541 }
542 return retval;
543}
544
526void MainWindow::closeEvent( QCloseEvent* ce ) 545void MainWindow::closeEvent( QCloseEvent* ce )
527{ 546{
528 547
529 548
530 549
531 if ( ! KOPrefs::instance()->mAskForQuit ) { 550 if ( ! KOPrefs::instance()->mAskForQuit ) {
532 saveOnClose(); 551 saveOnClose();
533 if ( mCalendarModifiedFlag ) { 552 if ( mCalendarModifiedFlag && !askForQuitOnSaveError() ) {
534 ce->ignore(); 553 ce->ignore();
535 return; 554 return;
536 } 555 }
537 mClosed = true; 556 mClosed = true;
538 ce->accept(); 557 ce->accept();
539 return; 558 return;
540 559
541 } 560 }
542 561
543 switch( QMessageBox::information( this, "KO/Pi", 562 switch( QMessageBox::information( this, "KO/Pi",
544 i18n("Do you really want\nto close KO/Pi?"), 563 i18n("Do you really want\nto close KO/Pi?"),
545 i18n("Close"), i18n("No"), 564 i18n("Close"), i18n("No"),
546 0, 0 ) ) { 565 0, 0 ) ) {
547 case 0: 566 case 0:
548 saveOnClose(); 567 saveOnClose();
549 if ( mCalendarModifiedFlag ) { 568 if ( mCalendarModifiedFlag && !askForQuitOnSaveError() ) {
550 ce->ignore(); 569 ce->ignore();
551 return; 570 return;
552 } 571 }
553 mClosed = true; 572 mClosed = true;
554 ce->accept(); 573 ce->accept();
555 break; 574 break;
556 case 1: 575 case 1:
557 ce->ignore(); 576 ce->ignore();
558 break; 577 break;
559 case 2: 578 case 2:
560 579
561 default: 580 default:
562 break; 581 break;
563 } 582 }
564 583
565 584
566} 585}
567void MainWindow::receiveStart( const QCString& cmsg, const QByteArray& data ) 586void MainWindow::receiveStart( const QCString& cmsg, const QByteArray& data )
568{ 587{
569 qDebug("KO: QCOP start message received: %s ", cmsg.data() ); 588 qDebug("KO: QCOP start message received: %s ", cmsg.data() );
570 mCStringMess = cmsg; 589 mCStringMess = cmsg;
571 mByteData = data; 590 mByteData = data;
572} 591}
573void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) 592void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
574{ 593{
575 QDataStream stream( data, IO_ReadOnly ); 594 QDataStream stream( data, IO_ReadOnly );
576 // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" ); 595 // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" );
577 //QString datamess; 596 //QString datamess;
578 //qDebug("message "); 597 //qDebug("message ");
579 qDebug("KO: QCOP message received: %s ", cmsg.data() ); 598 qDebug("KO: QCOP message received: %s ", cmsg.data() );
580 599
581 if ( cmsg == "setDocument(QString)" ) { 600 if ( cmsg == "setDocument(QString)" ) {
582 QDataStream stream( data, IO_ReadOnly ); 601 QDataStream stream( data, IO_ReadOnly );
583 QString fileName; 602 QString fileName;
584 stream >> fileName; 603 stream >> fileName;
585 //qDebug("filename %s ", fileName.latin1()); 604 //qDebug("filename %s ", fileName.latin1());
586 showMaximized(); 605 showMaximized();
587 raise(); 606 raise();
588 KOPrefs::instance()->mLastSyncedLocalFile = fileName ; 607 KOPrefs::instance()->mLastSyncedLocalFile = fileName ;
589 mSyncManager->slotSyncMenu( 1002 ); 608 mSyncManager->slotSyncMenu( 1002 );
590 return; 609 return;
591 } 610 }
592 611
593 if ( cmsg == "-writeFile" ) { 612 if ( cmsg == "-writeFile" ) {
594 // I made from the "-writeFile" an "-writeAlarm" 613 // I made from the "-writeFile" an "-writeAlarm"
595 mView->viewManager()->showWhatsNextView(); 614 mView->viewManager()->showWhatsNextView();
596 mCalendar->checkAlarmForIncidence( 0, true); 615 mCalendar->checkAlarmForIncidence( 0, true);
597 showMaximized(); 616 showMaximized();
598 raise(); 617 raise();
599 return; 618 return;
600 619
601 } 620 }
602 if ( cmsg == "-writeFileSilent" ) { 621 if ( cmsg == "-writeFileSilent" ) {
603 // I made from the "-writeFile" an "-writeAlarm" 622 // I made from the "-writeFile" an "-writeAlarm"
604 // mView->viewManager()->showWhatsNextView(); 623 // mView->viewManager()->showWhatsNextView();
605 mCalendar->checkAlarmForIncidence( 0, true); 624 mCalendar->checkAlarmForIncidence( 0, true);
606 //showMaximized(); 625 //showMaximized();
607 //raise(); 626 //raise();
608 hide(); 627 hide();
609 return; 628 return;
610 } 629 }
611 if ( cmsg == "-newCountdown" ) { 630 if ( cmsg == "-newCountdown" ) {
612 qDebug("newCountdown "); 631 qDebug("newCountdown ");
613 632
614 } 633 }
615 QString msg ; 634 QString msg ;
616 QString allmsg = cmsg; 635 QString allmsg = cmsg;
617 while ( allmsg.length() > 0 ) { 636 while ( allmsg.length() > 0 ) {
618 int nextC = allmsg.find( "-", 1 ); 637 int nextC = allmsg.find( "-", 1 );
619 if ( nextC == -1 ) { 638 if ( nextC == -1 ) {
620 msg = allmsg; 639 msg = allmsg;
621 allmsg = ""; 640 allmsg = "";
622 } else{ 641 } else{
623 msg = allmsg.left( nextC ); 642 msg = allmsg.left( nextC );
624 allmsg = allmsg.mid( nextC, allmsg.length()-nextC ); 643 allmsg = allmsg.mid( nextC, allmsg.length()-nextC );
625 } 644 }
626 //qDebug("msg: %s all: %s ", msg.latin1(), allmsg.latin1() ); 645 //qDebug("msg: %s all: %s ", msg.latin1(), allmsg.latin1() );
627 if ( msg == "-newEvent" ) { 646 if ( msg == "-newEvent" ) {
628 QTimer::singleShot( 0, mView, SLOT ( newEvent())); 647 QTimer::singleShot( 0, mView, SLOT ( newEvent()));
629 } 648 }
630 if ( msg == "-newTodo" ) { 649 if ( msg == "-newTodo" ) {
631 QTimer::singleShot( 0, mView, SLOT ( newTodo())); 650 QTimer::singleShot( 0, mView, SLOT ( newTodo()));
632 } 651 }
633 if ( msg == "-showWN" ) { 652 if ( msg == "-showWN" ) {
634 mView->viewManager()->showWhatsNextView(); 653 mView->viewManager()->showWhatsNextView();
635 } 654 }
636 if ( msg == "-showTodo" ) { 655 if ( msg == "-showTodo" ) {
637 mView->viewManager()->showTodoView(); 656 mView->viewManager()->showTodoView();
638 } 657 }
639 if ( msg == "-showList" ) { 658 if ( msg == "-showList" ) {
640 mView->viewManager()->showListView(); 659 mView->viewManager()->showListView();
641 } 660 }
642 else if ( msg == "-showDay" ) { 661 else if ( msg == "-showDay" ) {
643 mView->viewManager()->showDayView(); 662 mView->viewManager()->showDayView();
644 } 663 }
645 else if ( msg == "-showWWeek" ) { 664 else if ( msg == "-showWWeek" ) {
646 mView->viewManager()->showWorkWeekView(); 665 mView->viewManager()->showWorkWeekView();
647 } 666 }
648 else if ( msg == "-ringSync" ) { 667 else if ( msg == "-ringSync" ) {
649 QTimer::singleShot( 0, this, SLOT (startMultiSync())); 668 QTimer::singleShot( 0, this, SLOT (startMultiSync()));
650 } 669 }
651 else if ( msg == "-showWeek" ) { 670 else if ( msg == "-showWeek" ) {
652 mView->viewManager()->showWeekView(); 671 mView->viewManager()->showWeekView();
653 } 672 }
654 else if ( msg == "-showTodo" ) { 673 else if ( msg == "-showTodo" ) {
655 mView->viewManager()->showTodoView(); 674 mView->viewManager()->showTodoView();
656 } 675 }
657 else if ( msg == "-showJournal" ) { 676 else if ( msg == "-showJournal" ) {
658 mView->dateNavigator()->selectDates( 1 ); 677 mView->dateNavigator()->selectDates( 1 );
659 mView->dateNavigator()->selectToday(); 678 mView->dateNavigator()->selectToday();
660 mView->viewManager()->showJournalView(); 679 mView->viewManager()->showJournalView();
661 } 680 }
662 else if ( msg == "-showKO" ) { 681 else if ( msg == "-showKO" ) {
663 mView->viewManager()->showNextXView(); 682 mView->viewManager()->showNextXView();
664 } 683 }
665 else if ( msg == "-showWNext" ) { 684 else if ( msg == "-showWNext" ) {
666 mView->viewManager()->showWhatsNextView(); 685 mView->viewManager()->showWhatsNextView();
667 } 686 }
668 else if ( msg == "nextView()" ) { 687 else if ( msg == "nextView()" ) {
669 mView->viewManager()->showNextView(); 688 mView->viewManager()->showNextView();
670 } 689 }
671 else if ( msg == "-showNextXView" ) { 690 else if ( msg == "-showNextXView" ) {
672 mView->viewManager()->showNextXView(); 691 mView->viewManager()->showNextXView();
673 } 692 }
674 693
675 694
676 } 695 }
677 696
678 showMaximized(); 697 showMaximized();
679 raise(); 698 raise();
680} 699}
681void MainWindow::startMultiSync() 700void MainWindow::startMultiSync()
682{ 701{
683 QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); 702 QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
684 if ( QMessageBox::information( this, i18n("KDE-Pim Sync"), 703 if ( QMessageBox::information( this, i18n("KDE-Pim Sync"),
685 question, 704 question,
686 i18n("Yes"), i18n("No"), 705 i18n("Yes"), i18n("No"),
687 0, 0 ) != 0 ) { 706 0, 0 ) != 0 ) {
688 setCaption(i18n("Aborted! Nothing synced!")); 707 setCaption(i18n("Aborted! Nothing synced!"));
689 return; 708 return;
690 } 709 }
691 mSyncManager->multiSync( false ); 710 mSyncManager->multiSync( false );
692#ifndef DESKTOP_VERSION 711#ifndef DESKTOP_VERSION
693 QCopEnvelope e("QPE/Application/kapi", "doRingSync"); 712 QCopEnvelope e("QPE/Application/kapi", "doRingSync");
694#endif 713#endif
695} 714}
696QPixmap MainWindow::loadPixmap( QString name ) 715QPixmap MainWindow::loadPixmap( QString name )
697{ 716{
698 return SmallIcon( name ); 717 return SmallIcon( name );
699 718
700} 719}
701void MainWindow::setUsesBigPixmaps ( bool b ) 720void MainWindow::setUsesBigPixmaps ( bool b )
702{ 721{
703 qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b); 722 qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b);
704 if ( b ) 723 if ( b )
705 qDebug("KO: BigPixmaps are not supported "); 724 qDebug("KO: BigPixmaps are not supported ");
706} 725}
707void MainWindow::initActions() 726void MainWindow::initActions()
708{ 727{
709 //KOPrefs::instance()->mShowFullMenu 728 //KOPrefs::instance()->mShowFullMenu
710 iconToolBar->clear(); 729 iconToolBar->clear();
711 KOPrefs *p = KOPrefs::instance(); 730 KOPrefs *p = KOPrefs::instance();
712 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); 731 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
713 732
714 QPopupMenu *viewMenu = new QPopupMenu( this ); 733 QPopupMenu *viewMenu = new QPopupMenu( this );
715 QPopupMenu *actionMenu = new QPopupMenu( this ); 734 QPopupMenu *actionMenu = new QPopupMenu( this );
716 mCurrentItemMenu = new QPopupMenu ( this ); 735 mCurrentItemMenu = new QPopupMenu ( this );
717 QPopupMenu *nextConflictMenu = new QPopupMenu ( this ); 736 QPopupMenu *nextConflictMenu = new QPopupMenu ( this );
718 QPopupMenu *importMenu = new QPopupMenu( this ); 737 QPopupMenu *importMenu = new QPopupMenu( this );
719 QPopupMenu *importMenu_X = new QPopupMenu( this ); 738 QPopupMenu *importMenu_X = new QPopupMenu( this );
720 QPopupMenu *exportMenu_X = new QPopupMenu( this ); 739 QPopupMenu *exportMenu_X = new QPopupMenu( this );
721 QPopupMenu *beamMenu_X = new QPopupMenu( this ); 740 QPopupMenu *beamMenu_X = new QPopupMenu( this );
722 selectFilterMenu = new QPopupMenu( this ); 741 selectFilterMenu = new QPopupMenu( this );
723 selectFilterMenu->setCheckable( true ); 742 selectFilterMenu->setCheckable( true );
724 syncMenu = new QPopupMenu( this ); 743 syncMenu = new QPopupMenu( this );
725 configureAgendaMenu = new QPopupMenu( this ); 744 configureAgendaMenu = new QPopupMenu( this );
726 configureToolBarMenu = new QPopupMenu( this ); 745 configureToolBarMenu = new QPopupMenu( this );
727 QPopupMenu *helpMenu = new QPopupMenu( this ); 746 QPopupMenu *helpMenu = new QPopupMenu( this );
728 QIconSet icon; 747 QIconSet icon;
729 int pixWid = 22, pixHei = 22; 748 int pixWid = 22, pixHei = 22;
730 QString pathString = ""; 749 QString pathString = "";
731 if ( !p->mToolBarMiniIcons ) { 750 if ( !p->mToolBarMiniIcons ) {
732 if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) { 751 if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
733 pathString += "icons16/"; 752 pathString += "icons16/";
734 pixWid = 18; pixHei = 16; 753 pixWid = 18; pixHei = 16;
735 } 754 }
736 } else { 755 } else {
737 pathString += "iconsmini/"; 756 pathString += "iconsmini/";
738 pixWid = 18; pixHei = 16; 757 pixWid = 18; pixHei = 16;
739 } 758 }
740 759
741 if ( KOPrefs::instance()->mShowFullMenu ) { 760 if ( KOPrefs::instance()->mShowFullMenu ) {
@@ -976,384 +995,388 @@ void MainWindow::initActions()
976 995
977 996
978 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 997 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
979 mToggleNav, SLOT( setEnabled ( bool ) ) ); 998 mToggleNav, SLOT( setEnabled ( bool ) ) );
980 //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 999 //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
981 // mToggleFilter, SLOT( setEnabled ( bool ) ) ); 1000 // mToggleFilter, SLOT( setEnabled ( bool ) ) );
982 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 1001 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
983 mToggleAllday, SLOT( setEnabled ( bool ) ) ); 1002 mToggleAllday, SLOT( setEnabled ( bool ) ) );
984 // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 1003 // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
985 // configureAgendaMenu, SLOT( setEnabled ( bool ) ) ); 1004 // configureAgendaMenu, SLOT( setEnabled ( bool ) ) );
986 1005
987 1006
988 dPickerAction->addTo( iconToolBar ); 1007 dPickerAction->addTo( iconToolBar );
989 viewMenu->insertSeparator(); 1008 viewMenu->insertSeparator();
990 1009
991 if ( p-> mShowIconToggleFull ) 1010 if ( p-> mShowIconToggleFull )
992 FSaction->addTo( iconToolBar ); 1011 FSaction->addTo( iconToolBar );
993 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); 1012 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
994 1013
995 //******************** 1014 //********************
996 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); 1015 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
997 1016
998 1017
999 icon = loadPixmap( pathString + "whatsnext" ); 1018 icon = loadPixmap( pathString + "whatsnext" );
1000 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); 1019 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
1001 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); 1020 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
1002 whatsnext_action->addTo( viewMenu ); 1021 whatsnext_action->addTo( viewMenu );
1003 connect( whatsnext_action, SIGNAL( activated() ), 1022 connect( whatsnext_action, SIGNAL( activated() ),
1004 mView->viewManager(), SLOT( showWhatsNextView() ) ); 1023 mView->viewManager(), SLOT( showWhatsNextView() ) );
1005 1024
1006 icon = loadPixmap( pathString + "xdays" ); 1025 icon = loadPixmap( pathString + "xdays" );
1007 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); 1026 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
1008 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); 1027 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
1009 xdays_action->addTo( viewMenu ); 1028 xdays_action->addTo( viewMenu );
1010 connect( xdays_action, SIGNAL( activated() ), 1029 connect( xdays_action, SIGNAL( activated() ),
1011 mView->viewManager(), SLOT( showNextXView() ) ); 1030 mView->viewManager(), SLOT( showNextXView() ) );
1012 1031
1013 1032
1014 icon = loadPixmap( pathString + "journal" ); 1033 icon = loadPixmap( pathString + "journal" );
1015 configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); 1034 configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
1016 QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); 1035 QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
1017 viewjournal_action->addTo( viewMenu ); 1036 viewjournal_action->addTo( viewMenu );
1018 connect( viewjournal_action, SIGNAL( activated() ), 1037 connect( viewjournal_action, SIGNAL( activated() ),
1019 mView->viewManager(), SLOT( showJournalView() ) ); 1038 mView->viewManager(), SLOT( showJournalView() ) );
1020 1039
1021 1040
1022 icon = loadPixmap( pathString + "day" ); 1041 icon = loadPixmap( pathString + "day" );
1023 configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); 1042 configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 );
1024 QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); 1043 QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this );
1025 day1_action->addTo( viewMenu ); 1044 day1_action->addTo( viewMenu );
1026 // action->addTo( toolBar ); 1045 // action->addTo( toolBar );
1027 connect( day1_action, SIGNAL( activated() ), 1046 connect( day1_action, SIGNAL( activated() ),
1028 mView->viewManager(), SLOT( showDayView() ) ); 1047 mView->viewManager(), SLOT( showDayView() ) );
1029 1048
1030 icon = loadPixmap( pathString + "workweek" ); 1049 icon = loadPixmap( pathString + "workweek" );
1031 configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 ); 1050 configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 );
1032 QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); 1051 QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
1033 day5_action->addTo( viewMenu ); 1052 day5_action->addTo( viewMenu );
1034 connect( day5_action, SIGNAL( activated() ), 1053 connect( day5_action, SIGNAL( activated() ),
1035 mView->viewManager(), SLOT( showWorkWeekView() ) ); 1054 mView->viewManager(), SLOT( showWorkWeekView() ) );
1036 1055
1037 icon = loadPixmap( pathString + "week" ); 1056 icon = loadPixmap( pathString + "week" );
1038 configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); 1057 configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
1039 QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this ); 1058 QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
1040 day7_action->addTo( viewMenu ); 1059 day7_action->addTo( viewMenu );
1041 connect( day7_action, SIGNAL( activated() ), 1060 connect( day7_action, SIGNAL( activated() ),
1042 mView->viewManager(), SLOT( showWeekView() ) ); 1061 mView->viewManager(), SLOT( showWeekView() ) );
1043 1062
1044 icon = loadPixmap( pathString + "workweek2" ); 1063 icon = loadPixmap( pathString + "workweek2" );
1045 configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 ); 1064 configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
1046 QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this ); 1065 QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
1047 day6_action->addTo( viewMenu ); 1066 day6_action->addTo( viewMenu );
1048 connect( day6_action, SIGNAL( activated() ), 1067 connect( day6_action, SIGNAL( activated() ),
1049 mView->viewManager(), SLOT( showMonthViewWeek() ) ); 1068 mView->viewManager(), SLOT( showMonthViewWeek() ) );
1050 1069
1051 icon = loadPixmap( pathString + "month" ); 1070 icon = loadPixmap( pathString + "month" );
1052 configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); 1071 configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
1053 QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); 1072 QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
1054 month_action->addTo( viewMenu ); 1073 month_action->addTo( viewMenu );
1055 connect( month_action, SIGNAL( activated() ), 1074 connect( month_action, SIGNAL( activated() ),
1056 mView->viewManager(), SLOT( showMonthView() ) ); 1075 mView->viewManager(), SLOT( showMonthView() ) );
1057 1076
1058 icon = loadPixmap( pathString + "list" ); 1077 icon = loadPixmap( pathString + "list" );
1059 configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); 1078 configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
1060 QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); 1079 QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
1061 showlist_action->addTo( viewMenu ); 1080 showlist_action->addTo( viewMenu );
1062 connect( showlist_action, SIGNAL( activated() ), 1081 connect( showlist_action, SIGNAL( activated() ),
1063 mView->viewManager(), SLOT( showListView() ) ); 1082 mView->viewManager(), SLOT( showListView() ) );
1064 1083
1065 icon = loadPixmap( pathString + "todo" ); 1084 icon = loadPixmap( pathString + "todo" );
1066 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); 1085 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
1067 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); 1086 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
1068 todoview_action->addTo( viewMenu ); 1087 todoview_action->addTo( viewMenu );
1069 connect( todoview_action, SIGNAL( activated() ), 1088 connect( todoview_action, SIGNAL( activated() ),
1070 mView->viewManager(), SLOT( showTodoView() ) ); 1089 mView->viewManager(), SLOT( showTodoView() ) );
1071 1090
1072 1091
1073 1092
1074#if 0 1093#if 0
1075 action = new QAction( "view_timespan", "Time Span", 0, this ); 1094 action = new QAction( "view_timespan", "Time Span", 0, this );
1076 action->addTo( viewMenu ); 1095 action->addTo( viewMenu );
1077 connect( action, SIGNAL( activated() ), 1096 connect( action, SIGNAL( activated() ),
1078 mView->viewManager(), SLOT( showTimeSpanView() ) ); 1097 mView->viewManager(), SLOT( showTimeSpanView() ) );
1079#endif 1098#endif
1080 1099
1081 1100
1082 1101
1083 action = new QAction( "purge_completed", i18n("Purge Completed..."), 0, 1102 action = new QAction( "purge_completed", i18n("Purge Completed..."), 0,
1084 this ); 1103 this );
1085 action->addTo( actionMenu ); 1104 action->addTo( actionMenu );
1086 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); 1105 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
1087 1106
1088 1107
1089 icon = loadPixmap( pathString + "search" ); 1108 icon = loadPixmap( pathString + "search" );
1090 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); 1109 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
1091 1110
1092 1111
1093 1112
1094 actionMenu->insertSeparator(); 1113 actionMenu->insertSeparator();
1095 action = new QAction( "manage cat", i18n("Edit category list..."), 0, 1114 action = new QAction( "manage cat", i18n("Edit category list..."), 0,
1096 this ); 1115 this );
1097 action->addTo( actionMenu ); 1116 action->addTo( actionMenu );
1098 connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) ); 1117 connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) );
1099 1118
1100 action = new QAction( "manage cat", i18n("Manage new categories..."), 0, 1119 action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1101 this ); 1120 this );
1102 action->addTo( actionMenu ); 1121 action->addTo( actionMenu );
1103 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); 1122 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1104 1123
1105 1124
1106 actionMenu->insertSeparator(); 1125 actionMenu->insertSeparator();
1107 icon = loadPixmap( pathString + "configure" ); 1126 icon = loadPixmap( pathString + "configure" );
1108 action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); 1127 action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
1109 action->addTo( actionMenu ); 1128 action->addTo( actionMenu );
1110 connect( action, SIGNAL( activated() ), 1129 connect( action, SIGNAL( activated() ),
1111 mView, SLOT( edit_options() ) ); 1130 mView, SLOT( edit_options() ) );
1112 action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this ); 1131 action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this );
1113 action->addTo( actionMenu ); 1132 action->addTo( actionMenu );
1114 connect( action, SIGNAL( activated() ), 1133 connect( action, SIGNAL( activated() ),
1115 this, SLOT( calHint() ) ); 1134 this, SLOT( calHint() ) );
1116 action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); 1135 action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
1117 action->addTo( actionMenu ); 1136 action->addTo( actionMenu );
1118 connect( action, SIGNAL( activated() ), 1137 connect( action, SIGNAL( activated() ),
1119 mView, SLOT( edit_global_options() ) ); 1138 mView, SLOT( edit_global_options() ) );
1120 if ( KOPrefs::instance()->mShowFullMenu ) { 1139 if ( KOPrefs::instance()->mShowFullMenu ) {
1121 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); 1140 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
1122 1141
1123 } 1142 }
1124 // actionMenu->insertSeparator(); 1143 // actionMenu->insertSeparator();
1125 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, 1144 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
1126 this ); 1145 this );
1127 action->addTo( importMenu_X ); 1146 action->addTo( importMenu_X );
1128 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); 1147 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
1129 action = new QAction( "import_quick", i18n("Import last file"), 0, 1148 action = new QAction( "import_quick", i18n("Import last file"), 0,
1130 this ); 1149 this );
1131 action->addTo( importMenu_X ); 1150 action->addTo( importMenu_X );
1132 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); 1151 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
1133 importMenu_X->insertSeparator(); 1152 importMenu_X->insertSeparator();
1134 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, 1153 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
1135 this ); 1154 this );
1136 action->addTo( importMenu_X ); 1155 action->addTo( importMenu_X );
1137 connect( action, SIGNAL( activated() ), SLOT( importBday() ) ); 1156 connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
1138 //#ifndef DESKTOP_VERSION 1157 //#ifndef DESKTOP_VERSION
1139 importMenu_X->insertSeparator(); 1158 importMenu_X->insertSeparator();
1140 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0, 1159 action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
1141 this ); 1160 this );
1142 action->addTo( importMenu_X ); 1161 action->addTo( importMenu_X );
1143 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) ); 1162 connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
1144 //#else 1163 //#else
1145#ifdef _OL_IMPORT_ 1164#ifdef _OL_IMPORT_
1146 importMenu_X->insertSeparator(); 1165 importMenu_X->insertSeparator();
1147 action = new QAction( "import_ol", i18n("Import from OL"), 0, 1166 action = new QAction( "import_ol", i18n("Import from OL"), 0,
1148 this ); 1167 this );
1149 action->addTo( importMenu_X ); 1168 action->addTo( importMenu_X );
1150 connect( action, SIGNAL( activated() ), SLOT( importOL() ) ); 1169 connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
1151#endif 1170#endif
1152 //#endif 1171 //#endif
1153 1172
1154 //importMenu->insertSeparator(); 1173 //importMenu->insertSeparator();
1155#if 0 1174#if 0
1156 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, 1175 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
1157 this ); 1176 this );
1158 action->addTo( importMenu ); 1177 action->addTo( importMenu );
1159 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); 1178 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
1160#endif 1179#endif
1161 action = new QAction( "save_cal", i18n("Save Backup..."), 0, 1180 action = new QAction( "save_cal", i18n("Save Backup..."), 0,
1162 this ); 1181 this );
1163 action->addTo( importMenu ); 1182 action->addTo( importMenu );
1164 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); 1183 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
1165 importMenu->insertSeparator(); 1184 importMenu->insertSeparator();
1166 importMenu->insertItem( i18n("Import"), importMenu_X ); 1185 importMenu->insertItem( i18n("Import"), importMenu_X );
1167 //importMenu->insertSeparator(); 1186 //importMenu->insertSeparator();
1187 action = new QAction( "export ical", i18n("Export All Data"), 0,
1188 this );
1189 action->addTo( exportMenu_X );
1190 connect( action, SIGNAL( activated() ), SLOT( exportICalendar() ) );
1168 action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0, 1191 action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
1169 this ); 1192 this );
1170 action->addTo( exportMenu_X ); 1193 action->addTo( exportMenu_X );
1171 connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) ); 1194 connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
1172 1195
1173 1196
1174 //LR 1197 //LR
1175 QPopupMenu *ex2phone = new QPopupMenu( this ); 1198 QPopupMenu *ex2phone = new QPopupMenu( this );
1176 ex2phone->insertItem(i18n("Complete calendar..."), 1 ); 1199 ex2phone->insertItem(i18n("Complete calendar..."), 1 );
1177 ex2phone->insertItem(i18n("Filtered calendar..."), 2 ); 1200 ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
1178 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) ); 1201 connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
1179 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone ); 1202 exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
1180 1203
1181 importMenu->insertItem( i18n("Export"), exportMenu_X ); 1204 importMenu->insertItem( i18n("Export"), exportMenu_X );
1182 mPrintSelAction = 0; 1205 mPrintSelAction = 0;
1183#ifndef DESKTOP_VERSION 1206#ifndef DESKTOP_VERSION
1184 //importMenu->insertSeparator(); 1207 //importMenu->insertSeparator();
1185 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0, 1208 brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
1186 this ); 1209 this );
1187 brAction->addTo( beamMenu_X ); 1210 brAction->addTo( beamMenu_X );
1188 brAction->setToggleAction (true ) ; 1211 brAction->setToggleAction (true ) ;
1189 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) ); 1212 connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
1190 1213
1191 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0, 1214 action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
1192 this ); 1215 this );
1193 action->addTo( beamMenu_X ); 1216 action->addTo( beamMenu_X );
1194 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) ); 1217 connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
1195 1218
1196 action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0, 1219 action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
1197 this ); 1220 this );
1198 action->addTo( beamMenu_X ); 1221 action->addTo( beamMenu_X );
1199 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) ); 1222 connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
1200 importMenu->insertItem( i18n("Beam"), beamMenu_X ); 1223 importMenu->insertItem( i18n("Beam"), beamMenu_X );
1201#else 1224#else
1202 //importMenu->insertSeparator(); 1225 //importMenu->insertSeparator();
1203 icon = loadPixmap( pathString + "print" ); 1226 icon = loadPixmap( pathString + "print" );
1204 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this ); 1227 action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
1205 action->addTo( beamMenu_X ); 1228 action->addTo( beamMenu_X );
1206 connect( action, SIGNAL( activated() ), 1229 connect( action, SIGNAL( activated() ),
1207 this, SLOT( printCal() ) ); 1230 this, SLOT( printCal() ) );
1208 1231
1209 icon = loadPixmap( pathString + "week" ); 1232 icon = loadPixmap( pathString + "week" );
1210 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this ); 1233 action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
1211 action->addTo( beamMenu_X ); 1234 action->addTo( beamMenu_X );
1212 connect( action, SIGNAL( activated() ), 1235 connect( action, SIGNAL( activated() ),
1213 this, SLOT( printSel() ) ); 1236 this, SLOT( printSel() ) );
1214 icon = loadPixmap( pathString + "whatsnext" ); 1237 icon = loadPixmap( pathString + "whatsnext" );
1215 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this ); 1238 action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
1216 action->addTo( beamMenu_X ); 1239 action->addTo( beamMenu_X );
1217 connect( action, SIGNAL( activated() ), 1240 connect( action, SIGNAL( activated() ),
1218 mView->viewManager(), SLOT( slotprintWNV() ) ); 1241 mView->viewManager(), SLOT( slotprintWNV() ) );
1219 1242
1220 1243
1221 icon = loadPixmap( pathString + "list" ); 1244 icon = loadPixmap( pathString + "list" );
1222 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this ); 1245 action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
1223 action->addTo( beamMenu_X ); 1246 action->addTo( beamMenu_X );
1224 connect( action, SIGNAL( activated() ), 1247 connect( action, SIGNAL( activated() ),
1225 this, SLOT( printListView() ) ); 1248 this, SLOT( printListView() ) );
1226 1249
1227 icon = loadPixmap( pathString + "newevent" ); 1250 icon = loadPixmap( pathString + "newevent" );
1228 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this ); 1251 action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
1229 action->addTo( beamMenu_X ); 1252 action->addTo( beamMenu_X );
1230 connect( action, SIGNAL( activated() ), 1253 connect( action, SIGNAL( activated() ),
1231 mView, SLOT( slotprintSelInc() ) ); 1254 mView, SLOT( slotprintSelInc() ) );
1232 mPrintSelAction = action; 1255 mPrintSelAction = action;
1233 importMenu->insertItem( i18n("Print"), beamMenu_X ); 1256 importMenu->insertItem( i18n("Print"), beamMenu_X );
1234#endif 1257#endif
1235 1258
1236 importMenu->insertSeparator(); 1259 importMenu->insertSeparator();
1237 action = new QAction( "beam all", i18n("Save"), 0, 1260 action = new QAction( "beam all", i18n("Save"), 0,
1238 this ); 1261 this );
1239 action->addTo( importMenu ); 1262 action->addTo( importMenu );
1240 connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); 1263 connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
1241 action = new QAction( "beam all", i18n("Exit (+save)"), 0, 1264 action = new QAction( "beam all", i18n("Exit (+save)"), 0,
1242 this ); 1265 this );
1243 action->addTo( importMenu ); 1266 action->addTo( importMenu );
1244 connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); 1267 connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
1245 1268
1246 //menuBar->insertItem( "Configure",configureMenu ); 1269 //menuBar->insertItem( "Configure",configureMenu );
1247 //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); 1270 //configureMenu->insertItem( "Toolbar",configureToolBarMenu );
1248 icon = loadPixmap( "korganizer/korganizer" ); 1271 icon = loadPixmap( "korganizer/korganizer" );
1249 1272
1250 action = new QAction( "Whats New", i18n("What's new?"), 0,this ); 1273 action = new QAction( "Whats New", i18n("What's new?"), 0,this );
1251 action->addTo( helpMenu ); 1274 action->addTo( helpMenu );
1252 connect( action, SIGNAL( activated() ), 1275 connect( action, SIGNAL( activated() ),
1253 SLOT( whatsNew() ) ); 1276 SLOT( whatsNew() ) );
1254 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); 1277 action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
1255 action->addTo( helpMenu ); 1278 action->addTo( helpMenu );
1256 connect( action, SIGNAL( activated() ), 1279 connect( action, SIGNAL( activated() ),
1257 SLOT( features() ) ); 1280 SLOT( features() ) );
1258 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); 1281 action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
1259 action->addTo( helpMenu ); 1282 action->addTo( helpMenu );
1260 connect( action, SIGNAL( activated() ), 1283 connect( action, SIGNAL( activated() ),
1261 SLOT( keyBindings() ) ); 1284 SLOT( keyBindings() ) );
1262 action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this ); 1285 action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this );
1263 action->addTo( helpMenu ); 1286 action->addTo( helpMenu );
1264 connect( action, SIGNAL( activated() ), 1287 connect( action, SIGNAL( activated() ),
1265 SLOT( storagehowto() ) ); 1288 SLOT( storagehowto() ) );
1266 action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this ); 1289 action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this );
1267 action->addTo( helpMenu ); 1290 action->addTo( helpMenu );
1268 connect( action, SIGNAL( activated() ), 1291 connect( action, SIGNAL( activated() ),
1269 SLOT( timetrackinghowto() ) ); 1292 SLOT( timetrackinghowto() ) );
1270 action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); 1293 action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
1271 action->addTo( helpMenu ); 1294 action->addTo( helpMenu );
1272 connect( action, SIGNAL( activated() ), 1295 connect( action, SIGNAL( activated() ),
1273 SLOT( synchowto() ) ); 1296 SLOT( synchowto() ) );
1274 action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); 1297 action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
1275 action->addTo( helpMenu ); 1298 action->addTo( helpMenu );
1276 connect( action, SIGNAL( activated() ), 1299 connect( action, SIGNAL( activated() ),
1277 SLOT( kdesynchowto() ) ); 1300 SLOT( kdesynchowto() ) );
1278 action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); 1301 action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
1279 action->addTo( helpMenu ); 1302 action->addTo( helpMenu );
1280 connect( action, SIGNAL( activated() ), 1303 connect( action, SIGNAL( activated() ),
1281 SLOT( multisynchowto() ) ); 1304 SLOT( multisynchowto() ) );
1282 action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); 1305 action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
1283 action->addTo( helpMenu ); 1306 action->addTo( helpMenu );
1284 connect( action, SIGNAL( activated() ), 1307 connect( action, SIGNAL( activated() ),
1285 SLOT( aboutAutoSaving() ) ); 1308 SLOT( aboutAutoSaving() ) );
1286 action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); 1309 action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
1287 action->addTo( helpMenu ); 1310 action->addTo( helpMenu );
1288 connect( action, SIGNAL( activated() ), 1311 connect( action, SIGNAL( activated() ),
1289 SLOT( aboutKnownBugs() ) ); 1312 SLOT( aboutKnownBugs() ) );
1290 action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); 1313 action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
1291 action->addTo( helpMenu ); 1314 action->addTo( helpMenu );
1292 connect( action, SIGNAL( activated() ), 1315 connect( action, SIGNAL( activated() ),
1293 SLOT( usertrans() ) ); 1316 SLOT( usertrans() ) );
1294 action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); 1317 action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
1295 action->addTo( helpMenu ); 1318 action->addTo( helpMenu );
1296 connect( action, SIGNAL( activated() ), 1319 connect( action, SIGNAL( activated() ),
1297 SLOT( faq() ) ); 1320 SLOT( faq() ) );
1298 action = new QAction( "licence", i18n("Licence..."), 0, this ); 1321 action = new QAction( "licence", i18n("Licence..."), 0, this );
1299 action->addTo( helpMenu ); 1322 action->addTo( helpMenu );
1300 connect( action, SIGNAL( activated() ), 1323 connect( action, SIGNAL( activated() ),
1301 SLOT( licence() ) ); 1324 SLOT( licence() ) );
1302 action = new QAction( "about", i18n("About..."), 0, this ); 1325 action = new QAction( "about", i18n("About..."), 0, this );
1303 action->addTo( helpMenu ); 1326 action->addTo( helpMenu );
1304 connect( action, SIGNAL( activated() ), 1327 connect( action, SIGNAL( activated() ),
1305 SLOT( about() ) ); 1328 SLOT( about() ) );
1306 //menuBar->insertSeparator(); 1329 //menuBar->insertSeparator();
1307 1330
1308 // ****************************************************** 1331 // ******************************************************
1309 // menubar icons 1332 // menubar icons
1310 1333
1311 1334
1312 1335
1313 //menuBar->insertItem( iconToolBar ); 1336 //menuBar->insertItem( iconToolBar );
1314 //xdays_action 1337 //xdays_action
1315 if (p-> mShowIconNewEvent) 1338 if (p-> mShowIconNewEvent)
1316 ne_action->addTo( iconToolBar ); 1339 ne_action->addTo( iconToolBar );
1317 if (p->mShowIconNewTodo ) 1340 if (p->mShowIconNewTodo )
1318 nt_action->addTo( iconToolBar ); 1341 nt_action->addTo( iconToolBar );
1319 if (p-> mShowIconSearch) 1342 if (p-> mShowIconSearch)
1320 search_action->addTo( iconToolBar ); 1343 search_action->addTo( iconToolBar );
1321 if (p-> mShowIconWhatsThis) 1344 if (p-> mShowIconWhatsThis)
1322 QWhatsThis::whatsThisButton ( iconToolBar ); 1345 QWhatsThis::whatsThisButton ( iconToolBar );
1323 if (p-> mShowIconNext) 1346 if (p-> mShowIconNext)
1324 whatsnext_action->addTo( viewToolBar ); 1347 whatsnext_action->addTo( viewToolBar );
1325 if (p-> mShowIconNextDays) 1348 if (p-> mShowIconNextDays)
1326 xdays_action->addTo( viewToolBar ); 1349 xdays_action->addTo( viewToolBar );
1327 if (p-> mShowIconJournal) 1350 if (p-> mShowIconJournal)
1328 viewjournal_action->addTo( viewToolBar ); 1351 viewjournal_action->addTo( viewToolBar );
1329 if (p-> mShowIconDay1) 1352 if (p-> mShowIconDay1)
1330 day1_action->addTo( viewToolBar ); 1353 day1_action->addTo( viewToolBar );
1331 if (p-> mShowIconDay5) 1354 if (p-> mShowIconDay5)
1332 day5_action->addTo( viewToolBar ); 1355 day5_action->addTo( viewToolBar );
1333 if (p-> mShowIconDay7) 1356 if (p-> mShowIconDay7)
1334 day7_action->addTo( viewToolBar ); 1357 day7_action->addTo( viewToolBar );
1335 if (p-> mShowIconDay6) 1358 if (p-> mShowIconDay6)
1336 day6_action->addTo( viewToolBar ); 1359 day6_action->addTo( viewToolBar );
1337 if (p-> mShowIconMonth) 1360 if (p-> mShowIconMonth)
1338 month_action->addTo( viewToolBar ); 1361 month_action->addTo( viewToolBar );
1339 if (p-> mShowIconList) 1362 if (p-> mShowIconList)
1340 showlist_action->addTo( viewToolBar ); 1363 showlist_action->addTo( viewToolBar );
1341 if (p-> mShowIconTodoview) 1364 if (p-> mShowIconTodoview)
1342 todoview_action->addTo( viewToolBar ); 1365 todoview_action->addTo( viewToolBar );
1343 1366
1344 icon = loadPixmap( pathString + "2leftarrowB" ); 1367 icon = loadPixmap( pathString + "2leftarrowB" );
1345 configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200); 1368 configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200);
1346 if (p-> mShowIconBackFast) { 1369 if (p-> mShowIconBackFast) {
1347 action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this ); 1370 action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
1348 connect( action, SIGNAL( activated() ), 1371 connect( action, SIGNAL( activated() ),
1349 mView, SLOT( goPreviousMonth() ) ); 1372 mView, SLOT( goPreviousMonth() ) );
1350 action->addTo( navigatorToolBar ); 1373 action->addTo( navigatorToolBar );
1351 } 1374 }
1352 icon = loadPixmap( pathString + "1leftarrowB" ); 1375 icon = loadPixmap( pathString + "1leftarrowB" );
1353 configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210); 1376 configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210);
1354 if (p-> mShowIconBack) { 1377 if (p-> mShowIconBack) {
1355 action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this ); 1378 action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
1356 connect( action, SIGNAL( activated() ), 1379 connect( action, SIGNAL( activated() ),
1357 mView, SLOT( goPrevious() ) ); 1380 mView, SLOT( goPrevious() ) );
1358 action->addTo( navigatorToolBar ); 1381 action->addTo( navigatorToolBar );
1359 } 1382 }
@@ -1778,440 +1801,442 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
1778 if ( ok ) { 1801 if ( ok ) {
1779 int years = noc.date().year() - incidence->dtStart().date().year(); 1802 int years = noc.date().year() - incidence->dtStart().date().year();
1780 startString += i18n(" (%1 y.)"). arg( years ); 1803 startString += i18n(" (%1 y.)"). arg( years );
1781 } 1804 }
1782 } 1805 }
1783 else 1806 else
1784 startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); 1807 startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true);
1785 } 1808 }
1786 } 1809 }
1787 else { 1810 else {
1788 if ( (( KCal::Todo*)incidence)->percentComplete() == 100 ) 1811 if ( (( KCal::Todo*)incidence)->percentComplete() == 100 )
1789 startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+i18n("completed on %1").arg( (( KCal::Todo*)incidence)->completedStr(true) ); 1812 startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+i18n("completed on %1").arg( (( KCal::Todo*)incidence)->completedStr(true) );
1790 else 1813 else
1791 startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed"); 1814 startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed");
1792 } 1815 }
1793 if ( !incidence->location().isEmpty() ) 1816 if ( !incidence->location().isEmpty() )
1794 startString += " (" +incidence->location()+")"; 1817 startString += " (" +incidence->location()+")";
1795 setCaption( incidence->summary()+startString); 1818 setCaption( incidence->summary()+startString);
1796 enableIncidenceActions( true ); 1819 enableIncidenceActions( true );
1797 if ( incidence->typeID() == eventID ) { 1820 if ( incidence->typeID() == eventID ) {
1798 mShowAction->setMenuText( i18n("Show Event") ); 1821 mShowAction->setMenuText( i18n("Show Event") );
1799 mNewSubTodoAction->setEnabled( false ); 1822 mNewSubTodoAction->setEnabled( false );
1800 } else if ( incidence->typeID() == todoID ) { 1823 } else if ( incidence->typeID() == todoID ) {
1801 mShowAction->setMenuText( i18n("Show Todo") ); 1824 mShowAction->setMenuText( i18n("Show Todo") );
1802 mNewSubTodoAction->setEnabled( true ); 1825 mNewSubTodoAction->setEnabled( true );
1803 } else { 1826 } else {
1804 mShowAction->setMenuText( i18n("Show") ); 1827 mShowAction->setMenuText( i18n("Show") );
1805 mNewSubTodoAction->setEnabled( false ); 1828 mNewSubTodoAction->setEnabled( false );
1806 } 1829 }
1807#ifdef DESKTOP_VERSION 1830#ifdef DESKTOP_VERSION
1808 static QPixmap jP = SmallIcon( "journal" ); 1831 static QPixmap jP = SmallIcon( "journal" );
1809 static QPixmap eP = SmallIcon( "newevent" ); 1832 static QPixmap eP = SmallIcon( "newevent" );
1810 static QPixmap tP = SmallIcon( "newtodo" ); 1833 static QPixmap tP = SmallIcon( "newtodo" );
1811 QIconSet icon; 1834 QIconSet icon;
1812 if ( incidence->typeID() == todoID ) 1835 if ( incidence->typeID() == todoID )
1813 icon = QIconSet ( tP ); 1836 icon = QIconSet ( tP );
1814 else if ( incidence->typeID() == eventID ) 1837 else if ( incidence->typeID() == eventID )
1815 icon = QIconSet ( eP ); 1838 icon = QIconSet ( eP );
1816 else if ( incidence->typeID() == journalID ) 1839 else if ( incidence->typeID() == journalID )
1817 icon = QIconSet ( jP ); 1840 icon = QIconSet ( jP );
1818 mPrintSelAction->setIconSet ( icon ); 1841 mPrintSelAction->setIconSet ( icon );
1819#endif 1842#endif
1820} 1843}
1821 1844
1822void MainWindow::enableIncidenceActions( bool enabled ) 1845void MainWindow::enableIncidenceActions( bool enabled )
1823{ 1846{
1824 mShowAction->setEnabled( enabled ); 1847 mShowAction->setEnabled( enabled );
1825 mEditAction->setEnabled( enabled ); 1848 mEditAction->setEnabled( enabled );
1826 mDeleteAction->setEnabled( enabled ); 1849 mDeleteAction->setEnabled( enabled );
1827 1850
1828 mCloneAction->setEnabled( enabled ); 1851 mCloneAction->setEnabled( enabled );
1829 mMoveAction->setEnabled( enabled ); 1852 mMoveAction->setEnabled( enabled );
1830#ifndef DESKTOP_VERSION 1853#ifndef DESKTOP_VERSION
1831 mBeamAction->setEnabled( enabled ); 1854 mBeamAction->setEnabled( enabled );
1832#else 1855#else
1833 mPrintSelAction->setEnabled( enabled ); 1856 mPrintSelAction->setEnabled( enabled );
1834#endif 1857#endif
1835 mCancelAction->setEnabled( enabled ); 1858 mCancelAction->setEnabled( enabled );
1836} 1859}
1837 1860
1838void MainWindow::importOL() 1861void MainWindow::importOL()
1839{ 1862{
1840#ifdef _OL_IMPORT_ 1863#ifdef _OL_IMPORT_
1841 mView->clearAllViews(); 1864 mView->clearAllViews();
1842 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); 1865 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
1843 id->exec(); 1866 id->exec();
1844 delete id; 1867 delete id;
1845 mView->calendar()->checkAlarmForIncidence( 0, true ); 1868 mView->calendar()->checkAlarmForIncidence( 0, true );
1846 mView->updateView(); 1869 mView->updateView();
1847#endif 1870#endif
1848} 1871}
1849void MainWindow::importBday() 1872void MainWindow::importBday()
1850{ 1873{
1851 int result = QMessageBox::warning( this, i18n("KO/Pi import information!"), 1874 int result = QMessageBox::warning( this, i18n("KO/Pi import information!"),
1852 i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"), 1875 i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
1853 i18n("Import!"), i18n("Cancel"), 0, 1876 i18n("Import!"), i18n("Cancel"), 0,
1854 0, 1 ); 1877 0, 1 );
1855 if ( result == 0 ) { 1878 if ( result == 0 ) {
1856 mView->importBday(); 1879 mView->importBday();
1857 1880
1858 } 1881 }
1859 1882
1860 1883
1861} 1884}
1862void MainWindow::importQtopia() 1885void MainWindow::importQtopia()
1863{ 1886{
1864 //#ifndef DESKTOP_VERSION 1887 //#ifndef DESKTOP_VERSION
1865 QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing"); 1888 QString mess = i18n("When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing");
1866#ifdef DESKTOP_VERSION 1889#ifdef DESKTOP_VERSION
1867 mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml"); 1890 mess += i18n("The content of the following files will be\nimported (located in your home directory (hd)):\n(hd)/Applications/datebook/datebook.xml\n(hd)/Applications/todolist/todolist.xml\nThe following category file will be used:\n(hd)/Settings/Categories.xml");
1868#endif 1891#endif
1869 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess, 1892 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mess,
1870 i18n("Import!"), i18n("Cancel"), 0, 1893 i18n("Import!"), i18n("Cancel"), 0,
1871 0, 1 ); 1894 0, 1 );
1872 if ( result == 0 ) { 1895 if ( result == 0 ) {
1873#ifndef DESKTOP_VERSION 1896#ifndef DESKTOP_VERSION
1874 QString datebook = Global::applicationFileName( "datebook", "datebook.xml"); 1897 QString datebook = Global::applicationFileName( "datebook", "datebook.xml");
1875 QString todolist = Global::applicationFileName( "todolist", "todolist.xml"); 1898 QString todolist = Global::applicationFileName( "todolist", "todolist.xml");
1876 QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml"; 1899 QString categories = QString( getenv( "HOME" ) ) + "/Settings/Categories.xml";
1877#else 1900#else
1878 QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml"; 1901 QString datebook = QDir::homeDirPath()+ "/Applications/datebook/datebook.xml";
1879 QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml"; 1902 QString todolist = QDir::homeDirPath()+ "/Applications/todolist/todolist.xml";
1880 QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml"; 1903 QString categories = QDir::homeDirPath()+ "/Settings/Categories.xml";
1881#endif 1904#endif
1882 mView->importQtopia( categories, datebook, todolist ); 1905 mView->importQtopia( categories, datebook, todolist );
1883 } 1906 }
1884 mView->calendar()->reInitAlarmSettings(); 1907 mView->calendar()->reInitAlarmSettings();
1885#if 0 1908#if 0
1886 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"), 1909 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
1887 i18n("Not supported \non desktop!\n"), 1910 i18n("Not supported \non desktop!\n"),
1888 i18n("Ok"), i18n("Cancel"), 0, 1911 i18n("Ok"), i18n("Cancel"), 0,
1889 0, 1 ); 1912 0, 1 );
1890 1913
1891#endif 1914#endif
1892} 1915}
1893 1916
1894void MainWindow::saveOnClose() 1917void MainWindow::saveOnClose()
1895{ 1918{
1896 KOPrefs *p = KOPrefs::instance(); 1919 KOPrefs *p = KOPrefs::instance();
1897 p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal ); 1920 p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal );
1898 p->mToolBarHorV = ( viewToolBar->orientation () == Qt:: Horizontal ); 1921 p->mToolBarHorV = ( viewToolBar->orientation () == Qt:: Horizontal );
1899 p->mToolBarHorN = ( navigatorToolBar->orientation () == Qt:: Horizontal ); 1922 p->mToolBarHorN = ( navigatorToolBar->orientation () == Qt:: Horizontal );
1900 if ( filterToolBar ) { 1923 if ( filterToolBar ) {
1901 p->mToolBarHorF = ( filterToolBar->orientation () == Qt:: Horizontal ); 1924 p->mToolBarHorF = ( filterToolBar->orientation () == Qt:: Horizontal );
1902 } 1925 }
1903#ifdef DESKTOP_VERSION 1926#ifdef DESKTOP_VERSION
1904 1927
1905 QPoint myP; 1928 QPoint myP;
1906 myP = mapFromGlobal( iconToolBar->mapToGlobal( QPoint( 0,0) ) ); 1929 myP = mapFromGlobal( iconToolBar->mapToGlobal( QPoint( 0,0) ) );
1907 if ( p->mToolBarHor ) 1930 if ( p->mToolBarHor )
1908 p->mToolBarUp = myP.y() > height()/2; 1931 p->mToolBarUp = myP.y() > height()/2;
1909 else 1932 else
1910 p->mToolBarUp = myP.x() > width()/2; 1933 p->mToolBarUp = myP.x() > width()/2;
1911 myP = mapFromGlobal( viewToolBar->mapToGlobal( QPoint( 0,0) ) ); 1934 myP = mapFromGlobal( viewToolBar->mapToGlobal( QPoint( 0,0) ) );
1912 if ( p->mToolBarHorV ) 1935 if ( p->mToolBarHorV )
1913 p->mToolBarUpV = myP.y() > height()/2; 1936 p->mToolBarUpV = myP.y() > height()/2;
1914 else 1937 else
1915 p->mToolBarUpV = myP.x() > width()/2 ; 1938 p->mToolBarUpV = myP.x() > width()/2 ;
1916 myP = mapFromGlobal( navigatorToolBar->mapToGlobal( QPoint( 0,0) ) ); 1939 myP = mapFromGlobal( navigatorToolBar->mapToGlobal( QPoint( 0,0) ) );
1917 if ( p->mToolBarHorN ) 1940 if ( p->mToolBarHorN )
1918 p->mToolBarUpN = myP.y() > height()/2; 1941 p->mToolBarUpN = myP.y() > height()/2;
1919 else 1942 else
1920 p->mToolBarUpN = myP.x() > width()/2 ; 1943 p->mToolBarUpN = myP.x() > width()/2 ;
1921 if ( filterToolBar ) { 1944 if ( filterToolBar ) {
1922 myP = mapFromGlobal( filterToolBar->mapToGlobal( QPoint( 0,0) ) ); 1945 myP = mapFromGlobal( filterToolBar->mapToGlobal( QPoint( 0,0) ) );
1923 if ( p->mToolBarHorF ) 1946 if ( p->mToolBarHorF )
1924 p->mToolBarUpF = myP.y() > height()/2; 1947 p->mToolBarUpF = myP.y() > height()/2;
1925 else 1948 else
1926 p->mToolBarUpF = myP.x() > width()/2 ; 1949 p->mToolBarUpF = myP.x() > width()/2 ;
1927 } 1950 }
1928#else 1951#else
1929 if ( p->mToolBarHor ) 1952 if ( p->mToolBarHor )
1930 p->mToolBarUp = iconToolBar->y() > height()/2; 1953 p->mToolBarUp = iconToolBar->y() > height()/2;
1931 else 1954 else
1932 p->mToolBarUp = iconToolBar->x() > width()/2; 1955 p->mToolBarUp = iconToolBar->x() > width()/2;
1933 if ( p->mToolBarHorV ) 1956 if ( p->mToolBarHorV )
1934 p->mToolBarUpV = viewToolBar->y() > height()/2; 1957 p->mToolBarUpV = viewToolBar->y() > height()/2;
1935 else 1958 else
1936 p->mToolBarUpV = viewToolBar->x() > width()/2 ; 1959 p->mToolBarUpV = viewToolBar->x() > width()/2 ;
1937 1960
1938 if ( p->mToolBarHorN ) 1961 if ( p->mToolBarHorN )
1939 p->mToolBarUpN = navigatorToolBar->y() > height()/2; 1962 p->mToolBarUpN = navigatorToolBar->y() > height()/2;
1940 else 1963 else
1941 p->mToolBarUpN = navigatorToolBar->x() > width()/2 ; 1964 p->mToolBarUpN = navigatorToolBar->x() > width()/2 ;
1942 if ( filterToolBar ) { 1965 if ( filterToolBar ) {
1943 if ( p->mToolBarHorF ) 1966 if ( p->mToolBarHorF )
1944 p->mToolBarUpF = filterToolBar->y() > height()/2; 1967 p->mToolBarUpF = filterToolBar->y() > height()/2;
1945 else 1968 else
1946 p->mToolBarUpF = filterToolBar->x() > width()/2 ; 1969 p->mToolBarUpF = filterToolBar->x() > width()/2 ;
1947 } 1970 }
1948#endif 1971#endif
1949 save(); 1972 save();
1950 mView->writeSettings(); 1973 mView->writeSettings();
1951 mView->checkSuspendAlarm(); 1974 mView->checkSuspendAlarm();
1952} 1975}
1953void MainWindow::slotModifiedChanged( bool ) 1976void MainWindow::slotModifiedChanged( bool )
1954{ 1977{
1955 if ( mBlockAtStartup ) 1978 if ( mBlockAtStartup )
1956 return; 1979 return;
1957 1980
1958 int msec; 1981 int msec;
1959 if ( mCalendarModifiedFlag ) { 1982 if ( mCalendarModifiedFlag ) {
1960 //qDebug(" MainWindow timer is running "); 1983 //qDebug(" MainWindow timer is running ");
1961 return; 1984 return;
1962 } 1985 }
1963 // we store the changes after 1 minute, 1986 // we store the changes after 1 minute,
1964 // and for safety reasons after 10 minutes again 1987 // and for safety reasons after 10 minutes again
1965 if ( !mSyncManager->blockSave() ) 1988 if ( !mSyncManager->blockSave() )
1966 msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000; 1989 msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
1967 else 1990 else
1968 msec = 1000 * 600; 1991 msec = 1000 * 600;
1969 mSaveTimer.start( msec, true ); // 1 minute 1992 mSaveTimer.start( msec, true ); // 1 minute
1970 mSaveTime.restart(); 1993 mSaveTimerStart = QDateTime::currentDateTime();
1971 mSaveDelay = msec/1000; 1994 mSaveDelay = msec/1000;
1972 qDebug("KO: Saving File in %d secs!", msec/1000); 1995 qDebug("KO: Saving File in %d secs!", msec/1000);
1973 mCalendarModifiedFlag = true; 1996 mCalendarModifiedFlag = true;
1974} 1997}
1975void MainWindow::saveStopTimer() 1998void MainWindow::saveStopTimer()
1976{ 1999{
1977 mSaveTimer.stop(); 2000 mSaveTimer.stop();
1978} 2001}
1979void MainWindow::backupAllFiles() 2002void MainWindow::backupAllFiles()
1980{ 2003{
1981 QDate reference ( 2000,1,1); 2004 QDate reference ( 2000,1,1);
1982 int daysTo = reference.daysTo ( QDate::currentDate() ); 2005 int daysTo = reference.daysTo ( QDate::currentDate() );
1983 setCaption(i18n("Creating backup ... please wait ..." )); 2006 setCaption(i18n("Creating backup ... please wait ..." ));
1984 qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate); 2007 qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate);
1985 // we need the file path, the backup dir and the number of bups as param 2008 // we need the file path, the backup dir and the number of bups as param
1986 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir; 2009 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
1987 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir) 2010 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
1988 bupDir = KGlobalSettings::backupDataDir(); 2011 bupDir = KGlobalSettings::backupDataDir();
1989 int retval = KApplication::createBackup( defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers ); 2012 int retval = KApplication::createBackup( defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );
1990 if ( retval == 0 ) { 2013 if ( retval == 0 ) {
1991 setCaption(i18n("Backup cancelled" )); 2014 setCaption(i18n("Backup cancelled" ));
1992 qDebug("KO: Backup cancelled. Will try again tomorrow "); 2015 qDebug("KO: Backup cancelled. Will try again tomorrow ");
1993 // retval == 0 : backup skipped for today, try again tomorrow 2016 // retval == 0 : backup skipped for today, try again tomorrow
1994 KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1; 2017 KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1;
1995 } else if ( retval == 1 ){ 2018 } else if ( retval == 1 ){
1996 qDebug("KO: Backup created."); 2019 qDebug("KO: Backup created.");
1997 // backup ok 2020 // backup ok
1998 QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; 2021 QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
1999 KopiCalendarFile * cal = calendars.first(); 2022 KopiCalendarFile * cal = calendars.first();
2000 cal = calendars.next(); 2023 cal = calendars.next();
2001 while ( cal ) { 2024 while ( cal ) {
2002 if ( !cal->mErrorOnLoad ) { 2025 if ( !cal->mErrorOnLoad ) {
2003 KApplication::createBackup( cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers ); 2026 KApplication::createBackup( cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );
2004 } 2027 }
2005 cal = calendars.next(); 2028 cal = calendars.next();
2006 } 2029 }
2007 KOPrefs::instance()->mLastBackupDate = daysTo; 2030 KOPrefs::instance()->mLastBackupDate = daysTo;
2008 setCaption(i18n("Backup succesfully finished" )); 2031 setCaption(i18n("Backup succesfully finished" ));
2009 } else if ( retval == 2 ){ 2032 } else if ( retval == 2 ){
2010 setCaption(i18n("Backup globally disabled" )); 2033 setCaption(i18n("Backup globally disabled" ));
2011 qDebug("KO: Backup globally cancelled."); 2034 qDebug("KO: Backup globally cancelled.");
2012 // backup globally cancelled 2035 // backup globally cancelled
2013 KPimGlobalPrefs::instance()->mBackupEnabled = false; 2036 KPimGlobalPrefs::instance()->mBackupEnabled = false;
2014 } 2037 }
2015 // retval == 3: do nothing, try again later 2038 // retval == 3: do nothing, try again later
2016} 2039}
2017void MainWindow::save() 2040void MainWindow::save()
2018{ 2041{
2019 if ( mSaveDelay ) { 2042 if ( mSaveDelay ) {
2020 if ( mSaveDelay + 60 < mSaveTime.elapsed()/1000 ) { 2043 int elapsed = mSaveTimerStart.secsTo( QDateTime::currentDateTime() );
2021 qDebug("KO: Save delay %d. Elapsed save time %d ", mSaveDelay, mSaveTime.elapsed()/1000 ); 2044 if ( mSaveDelay < elapsed ) {
2022 qDebug("KO: Restarting save timer"); 2045 qDebug("KO: Pending save after wakeup from suspend detected.");
2023 int msec = 10000; 2046 qDebug("KO: Save delay %d sec. Elapsed save time %d sec.", mSaveDelay, elapsed );
2024 mSaveTimer.start( msec, true ); // 1 minute 2047 qDebug("KO: Restarting save timer to save in 15 sec.");
2025 mSaveTime.restart(); 2048 int msec = 15000;
2049 mSaveTimer.start( msec, true );
2050 mSaveTimerStart = QDateTime::currentDateTime();
2026 mSaveDelay = msec/1000; 2051 mSaveDelay = msec/1000;
2027 return; 2052 return;
2028 } 2053 }
2029 } 2054 }
2030 2055
2031 if ( mView->viewManager()->journalView() ) 2056 if ( mView->viewManager()->journalView() )
2032 mView->viewManager()->journalView()->checkModified(); 2057 mView->viewManager()->journalView()->checkModified();
2033 if ( !mCalendarModifiedFlag ) { 2058 if ( !mCalendarModifiedFlag ) {
2034 qDebug("KO: Calendar not modified. Nothing saved."); 2059 qDebug("KO: Calendar not modified. Nothing saved.");
2035 return; 2060 return;
2036 } 2061 }
2037 if ( mSyncManager->blockSave() ) { 2062 if ( mSyncManager->blockSave() ) {
2038 slotModifiedChanged( true ); 2063 slotModifiedChanged( true );
2039 return; 2064 return;
2040 } 2065 }
2041 mSaveDelay = 0; 2066 mSaveDelay = 0;
2042 mSyncManager->setBlockSave(true); 2067 mSyncManager->setBlockSave(true);
2043 if ( mView->checkAllFileVersions() ) { 2068 if ( mView->checkAllFileVersions() ) {
2044 if ( KPimGlobalPrefs::instance()->mBackupEnabled ){ 2069 if ( KPimGlobalPrefs::instance()->mBackupEnabled ){
2045 QDate reference ( 2000,1,1); 2070 QDate reference ( 2000,1,1);
2046 int daysTo = reference.daysTo ( QDate::currentDate() ); 2071 int daysTo = reference.daysTo ( QDate::currentDate() );
2047 if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) { 2072 if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) {
2048 backupAllFiles(); 2073 backupAllFiles();
2049 } 2074 }
2050 ; // KPimGlobalPrefs::instance()->mLastBackupDate 2075 ; // KPimGlobalPrefs::instance()->mLastBackupDate
2051 } 2076 }
2052 QTime neededSaveTime; 2077 QTime neededSaveTime;
2053 neededSaveTime.start(); 2078 neededSaveTime.start();
2054 if ( !isMinimized () ) 2079 if ( !isMinimized () )
2055 setCaption(i18n("KO/Pi:Saving Data to File ..." )); 2080 setCaption(i18n("KO/Pi:Saving Data to File ..." ));
2056 qDebug("KO: Start saving data to file!"); 2081 qDebug("KO: Start saving data to file!");
2057 if ( mView->saveCalendars() ) 2082 if ( mView->saveCalendars() )
2058 mCalendarModifiedFlag = false; 2083 mCalendarModifiedFlag = false;
2059 int msNeeded = neededSaveTime.elapsed(); 2084 int msNeeded = neededSaveTime.elapsed();
2060 qDebug("KO: Needed %d ms for saving.",msNeeded ); 2085 qDebug("KO: Needed %d ms for saving.",msNeeded );
2061 QString savemes; 2086 QString savemes;
2062 savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000 ); 2087 savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000 );
2063 if ( !isMinimized () ) 2088 if ( !isMinimized () )
2064 setCaption(savemes); 2089 setCaption(savemes);
2065 else 2090 else
2066 qDebug(savemes); 2091 qDebug(savemes);
2067 } else { 2092 } else {
2068 setCaption(i18n("Saving cancelled!")); 2093 setCaption(i18n("Saving cancelled!"));
2069 mCalendarModifiedFlag = false; 2094 mCalendarModifiedFlag = false;
2070 slotModifiedChanged( true ); 2095 slotModifiedChanged( true );
2071 } 2096 }
2072 mSyncManager->setBlockSave( false ); 2097 mSyncManager->setBlockSave( false );
2073} 2098}
2074 2099
2075void MainWindow::keyReleaseEvent ( QKeyEvent * e) 2100void MainWindow::keyReleaseEvent ( QKeyEvent * e)
2076{ 2101{
2077 if ( !e->isAutoRepeat() ) { 2102 if ( !e->isAutoRepeat() ) {
2078 mFlagKeyPressed = false; 2103 mFlagKeyPressed = false;
2079 } 2104 }
2080} 2105}
2081void MainWindow::keyPressEvent ( QKeyEvent * e ) 2106void MainWindow::keyPressEvent ( QKeyEvent * e )
2082{ 2107{
2083 qApp->processEvents(); 2108 qApp->processEvents();
2084 if ( e->isAutoRepeat() && !mFlagKeyPressed ) { 2109 if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
2085 e->ignore(); 2110 e->ignore();
2086 // qDebug(" ignore %d",e->isAutoRepeat() ); 2111 // qDebug(" ignore %d",e->isAutoRepeat() );
2087 return; 2112 return;
2088 } 2113 }
2089 if (! e->isAutoRepeat() ) 2114 if (! e->isAutoRepeat() )
2090 mFlagKeyPressed = true; 2115 mFlagKeyPressed = true;
2091 KOPrefs *p = KOPrefs::instance(); 2116 KOPrefs *p = KOPrefs::instance();
2092 bool showSelectedDates = false; 2117 bool showSelectedDates = false;
2093 int size; 2118 int size;
2094 int pro = 0; 2119 int pro = 0;
2095 //qDebug("MainWindow::keyPressEvent "); 2120 //qDebug("MainWindow::keyPressEvent ");
2096 switch ( e->key() ) { 2121 switch ( e->key() ) {
2097 case Qt::Key_Right: 2122 case Qt::Key_Right:
2098 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) 2123 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton)
2099 mView->goNextMonth(); 2124 mView->goNextMonth();
2100 else 2125 else
2101 mView->goNext(); 2126 mView->goNext();
2102 showSelectedDates = true; 2127 showSelectedDates = true;
2103 break; 2128 break;
2104 case Qt::Key_Left: 2129 case Qt::Key_Left:
2105 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 2130 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
2106 mView->goPreviousMonth(); 2131 mView->goPreviousMonth();
2107 else 2132 else
2108 mView->goPrevious(); 2133 mView->goPrevious();
2109 showSelectedDates = true; 2134 showSelectedDates = true;
2110 break; 2135 break;
2111 case Qt::Key_Down: 2136 case Qt::Key_Down:
2112 mView->viewManager()->agendaView()->scrollOneHourDown(); 2137 mView->viewManager()->agendaView()->scrollOneHourDown();
2113 break; 2138 break;
2114 case Qt::Key_Up: 2139 case Qt::Key_Up:
2115 mView->viewManager()->agendaView()->scrollOneHourUp(); 2140 mView->viewManager()->agendaView()->scrollOneHourUp();
2116 break; 2141 break;
2117 case Qt::Key_K: 2142 case Qt::Key_K:
2118 mView->viewManager()->showMonthViewWeek(); 2143 mView->viewManager()->showMonthViewWeek();
2119 break; 2144 break;
2120 case Qt::Key_I: 2145 case Qt::Key_I:
2121 mView->showIncidence(); 2146 mView->showIncidence();
2122 break; 2147 break;
2123 case Qt::Key_Delete: 2148 case Qt::Key_Delete:
2124 case Qt::Key_Backspace: 2149 case Qt::Key_Backspace:
2125 mView->deleteIncidence(); 2150 mView->deleteIncidence();
2126 break; 2151 break;
2127 case Qt::Key_D: 2152 case Qt::Key_D:
2128 mView->viewManager()->showDayView(); 2153 mView->viewManager()->showDayView();
2129 showSelectedDates = true; 2154 showSelectedDates = true;
2130 break; 2155 break;
2131 case Qt::Key_O: 2156 case Qt::Key_O:
2132 mView->toggleFilerEnabled( ); 2157 mView->toggleFilerEnabled( );
2133 break; 2158 break;
2134 case Qt::Key_0: 2159 case Qt::Key_0:
2135 case Qt::Key_1: 2160 case Qt::Key_1:
2136 case Qt::Key_2: 2161 case Qt::Key_2:
2137 case Qt::Key_3: 2162 case Qt::Key_3:
2138 case Qt::Key_4: 2163 case Qt::Key_4:
2139 case Qt::Key_5: 2164 case Qt::Key_5:
2140 case Qt::Key_6: 2165 case Qt::Key_6:
2141 case Qt::Key_7: 2166 case Qt::Key_7:
2142 case Qt::Key_8: 2167 case Qt::Key_8:
2143 case Qt::Key_9: 2168 case Qt::Key_9:
2144 pro = e->key()-48; 2169 pro = e->key()-48;
2145 if ( pro == 0 ) 2170 if ( pro == 0 )
2146 pro = 10; 2171 pro = 10;
2147 if ( e->state() == Qt::ControlButton) 2172 if ( e->state() == Qt::ControlButton)
2148 pro += 10; 2173 pro += 10;
2149 break; 2174 break;
2150 case Qt::Key_M: 2175 case Qt::Key_M:
2151 mView->viewManager()->showMonthView(); 2176 mView->viewManager()->showMonthView();
2152 showSelectedDates = true; 2177 showSelectedDates = true;
2153 break; 2178 break;
2154 case Qt::Key_Insert: 2179 case Qt::Key_Insert:
2155 mView->newEvent(); 2180 mView->newEvent();
2156 break; 2181 break;
2157 case Qt::Key_S : 2182 case Qt::Key_S :
2158 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton) 2183 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton)
2159 mView->newSubTodo(); 2184 mView->newSubTodo();
2160 else 2185 else
2161 mView->dialogManager()->showSearchDialog(); 2186 mView->dialogManager()->showSearchDialog();
2162 break; 2187 break;
2163 case Qt::Key_Y : 2188 case Qt::Key_Y :
2164 case Qt::Key_Z : 2189 case Qt::Key_Z :
2165 mView->viewManager()->showWorkWeekView(); 2190 mView->viewManager()->showWorkWeekView();
2166 showSelectedDates = true; 2191 showSelectedDates = true;
2167 break; 2192 break;
2168 case Qt::Key_U : 2193 case Qt::Key_U :
2169 mView->viewManager()->showWeekView(); 2194 mView->viewManager()->showWeekView();
2170 showSelectedDates = true; 2195 showSelectedDates = true;
2171 break; 2196 break;
2172 case Qt::Key_H : 2197 case Qt::Key_H :
2173 keyBindings(); 2198 keyBindings();
2174 break; 2199 break;
2175 case Qt::Key_W: 2200 case Qt::Key_W:
2176 mView->viewManager()->showWhatsNextView(); 2201 mView->viewManager()->showWhatsNextView();
2177 break; 2202 break;
2178 case Qt::Key_L: 2203 case Qt::Key_L:
2179 mView->viewManager()->showListView(); 2204 mView->viewManager()->showListView();
2180 break; 2205 break;
2181 case Qt::Key_N: 2206 case Qt::Key_N:
2182 mView->viewManager()->showNextView(); 2207 mView->viewManager()->showNextView();
2183 break; 2208 break;
2184 case Qt::Key_V: 2209 case Qt::Key_V:
2185 mView->viewManager()->showTodoView(); 2210 mView->viewManager()->showTodoView();
2186 break; 2211 break;
2187 case Qt::Key_C: 2212 case Qt::Key_C:
2188 mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() ); 2213 mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() );
2189 break; 2214 break;
2190 case Qt::Key_P: 2215 case Qt::Key_P:
2191 mView->showDatePicker( ); 2216 mView->showDatePicker( );
2192 break; 2217 break;
2193 case Qt::Key_F: 2218 case Qt::Key_F:
2194 mView->editFilters(); 2219 mView->editFilters();
2195 break; 2220 break;
2196 case Qt::Key_R: 2221 case Qt::Key_R:
2197 mView->toggleFilter(); 2222 mView->toggleFilter();
2198 break; 2223 break;
2199 case Qt::Key_X: 2224 case Qt::Key_X:
2200 if ( e->state() == Qt::ControlButton ) 2225 if ( e->state() == Qt::ControlButton )
2201 mView->toggleDateNavigatorWidget(); 2226 mView->toggleDateNavigatorWidget();
2202 else { 2227 else {
2203 mView->viewManager()->showNextXView(); 2228 mView->viewManager()->showNextXView();
2204 showSelectedDates = true; 2229 showSelectedDates = true;
2205 } 2230 }
2206 break; 2231 break;
2207 case Qt::Key_Space: 2232 case Qt::Key_Space:
2208 mView->toggleExpand(); 2233 mView->toggleExpand();
2209 break; 2234 break;
2210 case Qt::Key_A: 2235 case Qt::Key_A:
2211 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) 2236 if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton )
2212 mView->showNextAlarms(); 2237 mView->showNextAlarms();
2213 else 2238 else
2214 mView->toggleAllDaySize(); 2239 mView->toggleAllDaySize();
2215 break; 2240 break;
2216 case Qt::Key_T: 2241 case Qt::Key_T:
2217 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) 2242 if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton )
@@ -2386,348 +2411,364 @@ void MainWindow::updateFilterToolbar()
2386 } 2411 }
2387 } 2412 }
2388 } 2413 }
2389} 2414}
2390void MainWindow::selectFilterPopup( int fil ) 2415void MainWindow::selectFilterPopup( int fil )
2391{ 2416{
2392 selectFilter( fil + 1 ); 2417 selectFilter( fil + 1 );
2393 2418
2394} 2419}
2395void MainWindow::configureToolBar( int item ) 2420void MainWindow::configureToolBar( int item )
2396{ 2421{
2397 2422
2398 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); 2423 configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) );
2399 KOPrefs *p = KOPrefs::instance(); 2424 KOPrefs *p = KOPrefs::instance();
2400 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); 2425 p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 );
2401 p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 ); 2426 p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 );
2402 p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 ); 2427 p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 );
2403 p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); 2428 p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 );
2404 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); 2429 p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
2405 p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 ); 2430 p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 );
2406 p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 ); 2431 p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 );
2407 p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 ); 2432 p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 );
2408 p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 ); 2433 p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 );
2409 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); 2434 p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
2410 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 ); 2435 p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
2411 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 ); 2436 p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
2412 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 ); 2437 p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
2413 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 ); 2438 p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 );
2414 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 ); 2439 p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
2415 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 ); 2440 p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
2416 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 ); 2441 p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
2417 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 ); 2442 p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );
2418 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 ); 2443 p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 );
2419 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); 2444 p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 );
2420 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 ); 2445 p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
2421 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 ); 2446 p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
2422 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 ); 2447 p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
2423 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); 2448 p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
2424 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); 2449 p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
2425 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); 2450 p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
2426 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); 2451 p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 );
2427 // initActions(); 2452 // initActions();
2428 setCaption ( i18n("Toolbar changes needs a restart!") ); 2453 setCaption ( i18n("Toolbar changes needs a restart!") );
2429} 2454}
2430void MainWindow::setCaption ( const QString & c ) 2455void MainWindow::setCaption ( const QString & c )
2431{ 2456{
2432 QString cap = c; 2457 QString cap = c;
2433 cap.replace( QRegExp("\n"), " " ); 2458 cap.replace( QRegExp("\n"), " " );
2434 cap = cap.stripWhiteSpace(); 2459 cap = cap.stripWhiteSpace();
2435 if ( cap.isEmpty() ) 2460 if ( cap.isEmpty() )
2436 cap = "KO/Pi"; 2461 cap = "KO/Pi";
2437 QWidget::setCaption( cap ); 2462 QWidget::setCaption( cap );
2438} 2463}
2439void MainWindow::setCaptionToDates() 2464void MainWindow::setCaptionToDates()
2440{ 2465{
2441 QString selDates; 2466 QString selDates;
2442 QDate date = mView->startDate(); 2467 QDate date = mView->startDate();
2443 if ( ! date.isValid() ) { 2468 if ( ! date.isValid() ) {
2444 setCaption(""); 2469 setCaption("");
2445 return; 2470 return;
2446 } 2471 }
2447 selDates = KGlobal::locale()->formatDate( date, true); 2472 selDates = KGlobal::locale()->formatDate( date, true);
2448 if (mView->startDate() < mView->endDate() ) 2473 if (mView->startDate() < mView->endDate() )
2449 selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); 2474 selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true);
2450 else { 2475 else {
2451 QString addString; 2476 QString addString;
2452 if ( date == QDateTime::currentDateTime().date() ) 2477 if ( date == QDateTime::currentDateTime().date() )
2453 addString = i18n("Today"); 2478 addString = i18n("Today");
2454 else if ( date == QDateTime::currentDateTime().date().addDays(1) ) 2479 else if ( date == QDateTime::currentDateTime().date().addDays(1) )
2455 addString = i18n("Tomorrow"); 2480 addString = i18n("Tomorrow");
2456 if ( !addString.isEmpty() ) 2481 if ( !addString.isEmpty() )
2457 selDates = addString+", "+selDates ; 2482 selDates = addString+", "+selDates ;
2458 } 2483 }
2459 setCaption( i18n("Dates: ") + selDates ); 2484 setCaption( i18n("Dates: ") + selDates );
2460 2485
2461} 2486}
2462void MainWindow::showConfigureAgenda( ) 2487void MainWindow::showConfigureAgenda( )
2463{ 2488{
2464 int iii; 2489 int iii;
2465 for ( iii = 1;iii<= 10 ;++iii ){ 2490 for ( iii = 1;iii<= 10 ;++iii ){
2466 configureAgendaMenu->setItemChecked( (iii+1)*2, false ); 2491 configureAgendaMenu->setItemChecked( (iii+1)*2, false );
2467 } 2492 }
2468 configureAgendaMenu->setItemChecked( (KOPrefs::instance()->mHourSize/2)*2, true ); 2493 configureAgendaMenu->setItemChecked( (KOPrefs::instance()->mHourSize/2)*2, true );
2469} 2494}
2470void MainWindow::configureAgenda( int item ) 2495void MainWindow::configureAgenda( int item )
2471{ 2496{
2472 if ( KOPrefs::instance()->mHourSize == item ) 2497 if ( KOPrefs::instance()->mHourSize == item )
2473 return; 2498 return;
2474 KOPrefs::instance()->mHourSize=item; 2499 KOPrefs::instance()->mHourSize=item;
2475 mView->viewManager()->agendaView()->updateConfig(); 2500 mView->viewManager()->agendaView()->updateConfig();
2476} 2501}
2477 2502
2478void MainWindow::saveCalendar() 2503void MainWindow::saveCalendar()
2479{ 2504{
2480 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir; 2505 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
2481 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir) 2506 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
2482 bupDir = KGlobalSettings::backupDataDir(); 2507 bupDir = KGlobalSettings::backupDataDir();
2483 bupDir = KGlobal::formatMessage ( bupDir, 0 ); 2508 bupDir = KGlobal::formatMessage ( bupDir, 0 );
2484 QString bupHint; 2509 QString bupHint;
2485 if ( !KPimGlobalPrefs::instance()->mBackupEnabled ) 2510 if ( !KPimGlobalPrefs::instance()->mBackupEnabled )
2486 bupHint = i18n("(Hint: You can enable automatic backup in the global settings!)"); 2511 bupHint = i18n("(Hint: You can enable automatic backup in the global settings!)");
2487 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; 2512 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;
2488 bool enabled = KPimGlobalPrefs::instance()->mBackupEnabled; 2513 bool enabled = KPimGlobalPrefs::instance()->mBackupEnabled;
2489 KPimGlobalPrefs::instance()->mBackupEnabled = false; 2514 KPimGlobalPrefs::instance()->mBackupEnabled = false;
2490 save(); 2515 save();
2491 KPimGlobalPrefs::instance()->mBackupEnabled = enabled; 2516 KPimGlobalPrefs::instance()->mBackupEnabled = enabled;
2492 backupAllFiles(); 2517 backupAllFiles();
2493} 2518}
2494void MainWindow::loadCalendar() 2519void MainWindow::loadCalendar()
2495{ 2520{
2496 2521
2497 2522
2498#if 0 2523#if 0
2499 QString fn = KOPrefs::instance()->mLastLoadFile; 2524 QString fn = KOPrefs::instance()->mLastLoadFile;
2500 fn = KFileDialog::getOpenFileName( fn, i18n("Load backup filename"), this ); 2525 fn = KFileDialog::getOpenFileName( fn, i18n("Load backup filename"), this );
2501 2526
2502 if ( fn == "" ) 2527 if ( fn == "" )
2503 return; 2528 return;
2504 QFileInfo info; 2529 QFileInfo info;
2505 info.setFile( fn ); 2530 info.setFile( fn );
2506 QString mess; 2531 QString mess;
2507 bool loadbup = true; 2532 bool loadbup = true;
2508 if ( info. exists() ) { 2533 if ( info. exists() ) {
2509 mess = i18n("Backup file from:\n%1\nLoading backup\nfile will delete\nyour current Data!\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); 2534 mess = i18n("Backup file from:\n%1\nLoading backup\nfile will delete\nyour current Data!\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
2510 int result = QMessageBox::warning( this, "KO/Pi: Warning!", 2535 int result = QMessageBox::warning( this, "KO/Pi: Warning!",
2511 mess, 2536 mess,
2512 i18n("Load!"), i18n("Cancel"), 0, 2537 i18n("Load!"), i18n("Cancel"), 0,
2513 0, 1 ); 2538 0, 1 );
2514 if ( result != 0 ) { 2539 if ( result != 0 ) {
2515 loadbup = false; 2540 loadbup = false;
2516 } 2541 }
2517 } else { 2542 } else {
2518 QMessageBox::warning( this, i18n("KO/Pi: Warning!"), 2543 QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
2519 i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0, 2544 i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0,
2520 0, 1 ); 2545 0, 1 );
2521 2546
2522 return; 2547 return;
2523 } 2548 }
2524 if ( loadbup ) { 2549 if ( loadbup ) {
2525 mView->openCalendar( fn ); 2550 mView->openCalendar( fn );
2526 KOPrefs::instance()->mLastLoadFile = fn; 2551 KOPrefs::instance()->mLastLoadFile = fn;
2527 mess = i18n("KO/Pi:Loaded %1").arg(fn) ; 2552 mess = i18n("KO/Pi:Loaded %1").arg(fn) ;
2528 setCaption(mess); 2553 setCaption(mess);
2529 } 2554 }
2530#endif 2555#endif
2531 2556
2532} 2557}
2533void MainWindow::quickImportIcal() 2558void MainWindow::quickImportIcal()
2534{ 2559{
2535 importFile( KOPrefs::instance()->mLastImportFile, false ); 2560 importFile( KOPrefs::instance()->mLastImportFile, false );
2536} 2561}
2537void MainWindow::importFile( QString fn, bool quick ) 2562void MainWindow::importFile( QString fn, bool quick )
2538{ 2563{
2539 QFileInfo info; 2564 QFileInfo info;
2540 info.setFile( fn ); 2565 info.setFile( fn );
2541 QString mess; 2566 QString mess;
2542 if ( !info. exists() ) { 2567 if ( !info. exists() ) {
2543 mess = i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30)); 2568 mess = i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30));
2544 QMessageBox::warning( this, i18n("KO/Pi: Warning!"), 2569 QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
2545 mess ); 2570 mess );
2546 return; 2571 return;
2547 } 2572 }
2548 int result = 0; 2573 int result = 0;
2549 if ( !quick ) { 2574 if ( !quick ) {
2550 mess = i18n( "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); 2575 mess = i18n( "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
2551 result = QMessageBox::warning( this, "KO/Pi: Warning!", 2576 result = QMessageBox::warning( this, "KO/Pi: Warning!",
2552 mess, 2577 mess,
2553 "Import", "Cancel", 0, 2578 "Import", "Cancel", 0,
2554 0, 1 ); 2579 0, 1 );
2555 } 2580 }
2556 if ( result == 0 ) { 2581 if ( result == 0 ) {
2557 if ( mView->openCalendar( fn, true )) { 2582 if ( mView->openCalendar( fn, true )) {
2558 KOPrefs::instance()->mLastImportFile = fn; 2583 KOPrefs::instance()->mLastImportFile = fn;
2559 setCaption(i18n("Imported file successfully")); 2584 setCaption(i18n("Imported file successfully"));
2560 } else { 2585 } else {
2561 setCaption(i18n("Error importing file")); 2586 setCaption(i18n("Error importing file"));
2562 } 2587 }
2563 mView->updateView(); 2588 mView->updateView();
2564 } 2589 }
2565} 2590}
2566 2591
2567void MainWindow::importIcal() 2592void MainWindow::importIcal()
2568{ 2593{
2569 2594
2570 QString fn =KOPrefs::instance()->mLastImportFile; 2595 QString fn =KOPrefs::instance()->mLastImportFile;
2571 2596
2572 fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this ); 2597 fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this );
2573 if ( fn == "" ) 2598 if ( fn == "" )
2574 return; 2599 return;
2575 importFile( fn, true ); 2600 importFile( fn, true );
2576 2601
2577} 2602}
2578 2603void MainWindow::exportCalendar( bool iCalFormat )
2579void MainWindow::exportVCalendar()
2580{ 2604{
2581 QString fn = KOPrefs::instance()->mLastVcalFile; 2605 QString fn = KOPrefs::instance()->mLastVcalFile;
2582 fn = KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this ); 2606 if ( iCalFormat ) {
2607 fn = QDir::homeDirPath()+"/kopiexport.ics";
2608 fn = KFileDialog::getSaveFileName( fn, i18n("Export iCal filename(*.ics)"), this );
2609 }
2610 else
2611 fn = KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this );
2583 if ( fn == "" ) 2612 if ( fn == "" )
2584 return; 2613 return;
2585 QFileInfo info; 2614 QFileInfo info;
2586 info.setFile( fn ); 2615 info.setFile( fn );
2587 QString mes; 2616 QString mes;
2588 bool createbup = true; 2617 bool createbup = true;
2589 if ( info. exists() ) { 2618 if ( info. exists() ) {
2590 mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) ); 2619 mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) );
2591 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes, 2620 int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
2592 i18n("Overwrite!"), i18n("Cancel"), 0, 2621 i18n("Overwrite!"), i18n("Cancel"), 0,
2593 0, 1 ); 2622 0, 1 );
2594 if ( result != 0 ) { 2623 if ( result != 0 ) {
2595 createbup = false; 2624 createbup = false;
2596 } 2625 }
2597 } 2626 }
2598 if ( createbup ) { 2627 if ( createbup ) {
2599 if ( mView->exportVCalendar( fn ) ) { 2628 bool success = false;
2600 KOPrefs::instance()->mLastVcalFile = fn; 2629 if ( iCalFormat )
2630 success = mView->exportICalendar( fn );
2631 else
2632 success = mView->exportVCalendar( fn );
2633 if ( success ) {
2601 if ( fn.length() > 20 ) 2634 if ( fn.length() > 20 )
2602 mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ; 2635 mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ;
2603 else 2636 else
2604 mes = i18n("KO/Pi:Exported to %1").arg(fn ); 2637 mes = i18n("KO/Pi:Exported to %1").arg(fn );
2605 setCaption(mes); 2638 setCaption(mes);
2606 } 2639 }
2607 } 2640 }
2608 2641
2609} 2642}
2643void MainWindow::exportICalendar()
2644{
2645 exportCalendar( true );
2646}
2647void MainWindow::exportVCalendar()
2648{
2649 exportCalendar( false );
2650}
2610QString MainWindow::sentSyncFile() 2651QString MainWindow::sentSyncFile()
2611{ 2652{
2612#ifdef DESKTOP_VERSION 2653#ifdef DESKTOP_VERSION
2613 return QDir::convertSeparators( locateLocal( "tmp", "copysynccal.ics" ) ); 2654 return QDir::convertSeparators( locateLocal( "tmp", "copysynccal.ics" ) );
2614#else 2655#else
2615 return QString( "/tmp/copysynccal.ics" ); 2656 return QString( "/tmp/copysynccal.ics" );
2616#endif 2657#endif
2617} 2658}
2618 2659
2619void MainWindow::syncFileRequest() 2660void MainWindow::syncFileRequest()
2620{ 2661{
2621 while ( mSyncManager->blockSave() ) { 2662 while ( mSyncManager->blockSave() ) {
2622 qApp->processEvents(); 2663 qApp->processEvents();
2623 } 2664 }
2624 mSyncManager->setBlockSave(true); 2665 mSyncManager->setBlockSave(true);
2625 2666
2626 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { 2667 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
2627 mSyncManager->slotSyncMenu( 999 ); 2668 mSyncManager->slotSyncMenu( 999 );
2628 } 2669 }
2629 2670
2630 setCaption(i18n("Saving Data to temp file ..." )); 2671 setCaption(i18n("Saving Data to temp file ..." ));
2631 mView->saveCalendar( sentSyncFile() ); 2672 mView->saveCalendar( sentSyncFile() );
2632 setCaption(i18n("Data saved to temp file!" )); 2673 setCaption(i18n("Data saved to temp file!" ));
2633 mSyncManager->setBlockSave( false ); 2674 mSyncManager->setBlockSave( false );
2634 2675
2635} 2676}
2636void MainWindow::getFile( bool success ) 2677void MainWindow::getFile( bool success )
2637{ 2678{
2638 if ( ! success ) { 2679 if ( ! success ) {
2639 setCaption( i18n("Error receiving file. Nothing changed!") ); 2680 setCaption( i18n("Error receiving file. Nothing changed!") );
2640 return; 2681 return;
2641 } 2682 }
2642 mView->mergeFile( sentSyncFile() ); 2683 mView->mergeFile( sentSyncFile() );
2643 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { 2684 if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
2644 mSyncManager->slotSyncMenu( 999 ); 2685 mSyncManager->slotSyncMenu( 999 );
2645 } 2686 }
2646 setCaption( i18n("Pi-Sync successful!") ); 2687 setCaption( i18n("Pi-Sync successful!") );
2647} 2688}
2648void MainWindow::printListView() 2689void MainWindow::printListView()
2649{ 2690{
2650 2691
2651 QString message = i18n("You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose <b>Hide selected items</b>. After that you can print the list without these items."); 2692 QString message = i18n("You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose <b>Hide selected items</b>. After that you can print the list without these items.");
2652 2693
2653 KMessageBox::information( this, message); 2694 KMessageBox::information( this, message);
2654} 2695}
2655void MainWindow::printSel( ) 2696void MainWindow::printSel( )
2656{ 2697{
2657 mView->viewManager()->agendaView()->agenda()->printSelection(); 2698 mView->viewManager()->agendaView()->agenda()->printSelection();
2658} 2699}
2659 2700
2660void MainWindow::printCal() 2701void MainWindow::printCal()
2661{ 2702{
2662 mView->print();//mCp->showDialog(); 2703 mView->print();//mCp->showDialog();
2663} 2704}
2664 2705
2665 2706
2666#include "libkdepim/kdatepicker.h" 2707#include "libkdepim/kdatepicker.h"
2667#include <kdatetbl.h> 2708#include <kdatetbl.h>
2668 2709
2669void MainWindow::weekAction() 2710void MainWindow::weekAction()
2670{ 2711{
2671 int month; 2712 int month;
2672 KPopupFrame* popup = new KPopupFrame(this); 2713 KPopupFrame* popup = new KPopupFrame(this);
2673 KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup); 2714 KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(popup);
2674 // ----- 2715 // -----
2675 picker->resize(picker->sizeHint()); 2716 picker->resize(picker->sizeHint());
2676 popup->setMainWidget(picker); 2717 popup->setMainWidget(picker);
2677 picker->setFocus(); 2718 picker->setFocus();
2678 connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); 2719 connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
2679 int x = 0; 2720 int x = 0;
2680 int y = iconToolBar->height(); 2721 int y = iconToolBar->height();
2681 int dX = 0; 2722 int dX = 0;
2682 int dY = 0; 2723 int dY = 0;
2683 if ( iconToolBar->orientation () == Qt:: Horizontal ) { 2724 if ( iconToolBar->orientation () == Qt:: Horizontal ) {
2684 if ( iconToolBar->y() > height()/2 ) { 2725 if ( iconToolBar->y() > height()/2 ) {
2685 dY = picker->sizeHint().height()+8; 2726 dY = picker->sizeHint().height()+8;
2686 y = 0; 2727 y = 0;
2687 } 2728 }
2688 } else { 2729 } else {
2689 if ( iconToolBar->x() > width()/2 ) { // right side 2730 if ( iconToolBar->x() > width()/2 ) { // right side
2690 x=0; 2731 x=0;
2691 dX= picker->sizeHint().width()+8; 2732 dX= picker->sizeHint().width()+8;
2692 y = 0; 2733 y = 0;
2693 } else { 2734 } else {
2694 x= iconToolBar->width(); 2735 x= iconToolBar->width();
2695 y = 0; 2736 y = 0;
2696 } 2737 }
2697 } 2738 }
2698 //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() ); 2739 //qDebug("dax %d dy %d %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() );
2699 if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY)))) 2740 if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY))))
2700 { 2741 {
2701 month = picker->getResult(); 2742 month = picker->getResult();
2702 emit selectWeek ( month ); 2743 emit selectWeek ( month );
2703 //qDebug("weekSelected %d ", month); 2744 //qDebug("weekSelected %d ", month);
2704 } 2745 }
2705 delete popup; 2746 delete popup;
2706} 2747}
2707 2748
2708void MainWindow::hideEvent ( QHideEvent * ) 2749void MainWindow::hideEvent ( QHideEvent * )
2709{ 2750{
2710 QString message; 2751 QString message;
2711 QDateTime nextA = mCalendar->nextAlarmEventDateTime(); 2752 QDateTime nextA = mCalendar->nextAlarmEventDateTime();
2712 if ( nextA.isValid() ) { 2753 if ( nextA.isValid() ) {
2713 QString sum = mCalendar->nextSummary(); 2754 QString sum = mCalendar->nextSummary();
2714 2755
2715 message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false)); 2756 message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false));
2716 setCaption( message ); 2757 setCaption( message );
2717 } 2758 }
2718} 2759}
2719 2760
2720void MainWindow::resizeEvent( QResizeEvent* e) 2761void MainWindow::resizeEvent( QResizeEvent* e)
2721{ 2762{
2722#ifndef DESKTOP_VERSION 2763#ifndef DESKTOP_VERSION
2723 if ( filterToolBar ) { 2764 if ( filterToolBar ) {
2724 if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) { 2765 if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) {
2725 if (QApplication::desktop()->width() > QApplication::desktop()->height() ) 2766 if (QApplication::desktop()->width() > QApplication::desktop()->height() )
2726 filterToolBar->hide(); 2767 filterToolBar->hide();
2727 else 2768 else
2728 filterToolBar->show(); 2769 filterToolBar->show();
2729 } 2770 }
2730 } 2771 }
2731#endif 2772#endif
2732 QMainWindow::resizeEvent( e); 2773 QMainWindow::resizeEvent( e);
2733} 2774}
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 657c0a8..71c069b 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -1,186 +1,189 @@
1#ifndef KORGE_MAINWINDOW_H 1#ifndef KORGE_MAINWINDOW_H
2#define KORGE_MAINWINDOW_H 2#define KORGE_MAINWINDOW_H
3 3
4#include <qmainwindow.h> 4#include <qmainwindow.h>
5#include <qtimer.h> 5#include <qtimer.h>
6#include <qdict.h> 6#include <qdict.h>
7#include <qfile.h> 7#include <qfile.h>
8#include <qmenubar.h> 8#include <qmenubar.h>
9#include <qtextstream.h> 9#include <qtextstream.h>
10#include <qregexp.h> 10#include <qregexp.h>
11 11
12#include <libkcal/incidence.h> 12#include <libkcal/incidence.h>
13#include <ksyncmanager.h> 13#include <ksyncmanager.h>
14#include <kpopupmenu.h> 14#include <kpopupmenu.h>
15#ifndef DESKTOP_VERSION 15#ifndef DESKTOP_VERSION
16#include <qcopchannel_qws.h> 16#include <qcopchannel_qws.h>
17#endif 17#endif
18class QAction; 18class QAction;
19class CalendarView; 19class CalendarView;
20class KSyncProfile; 20class KSyncProfile;
21#ifdef DESKTOP_VERSION 21#ifdef DESKTOP_VERSION
22 22
23#define QPEToolBar QToolBar 23#define QPEToolBar QToolBar
24#endif 24#endif
25class QPEToolBar; 25class QPEToolBar;
26 26
27 27
28namespace KCal { 28namespace KCal {
29class CalendarLocal; 29class CalendarLocal;
30} 30}
31 31
32using namespace KCal; 32using namespace KCal;
33 33
34class MainWindow : public QMainWindow 34class MainWindow : public QMainWindow
35{ 35{
36 Q_OBJECT 36 Q_OBJECT
37 public: 37 public:
38 MainWindow( QWidget *parent = 0, const char *name = 0 ); 38 MainWindow( QWidget *parent = 0, const char *name = 0 );
39 ~MainWindow(); 39 ~MainWindow();
40 bool beamReceiveEnabled(); 40 bool beamReceiveEnabled();
41 static QString defaultFileName(); 41 static QString defaultFileName();
42 static QString syncFileName(); 42 static QString syncFileName();
43 static QString resourcePath(); 43 static QString resourcePath();
44 public slots: 44 public slots:
45 void setUsesBigPixmaps ( bool ); 45 void setUsesBigPixmaps ( bool );
46 void setCaption ( const QString & ); 46 void setCaption ( const QString & );
47 void updateWeekNum(const KCal::DateList &); 47 void updateWeekNum(const KCal::DateList &);
48 void updateWeek(QDate); 48 void updateWeek(QDate);
49 void updateFilterToolbar(); 49 void updateFilterToolbar();
50 virtual void showMaximized (); 50 virtual void showMaximized ();
51 void configureAgenda( int ); 51 void configureAgenda( int );
52 void recieve( const QCString& msg, const QByteArray& data ); 52 void recieve( const QCString& msg, const QByteArray& data );
53 void receiveStart( const QCString& msg, const QByteArray& data ); 53 void receiveStart( const QCString& msg, const QByteArray& data );
54 protected slots: 54 protected slots:
55 void loadDataAfterStart(); 55 void loadDataAfterStart();
56 void calHint(); 56 void calHint();
57 void startMultiSync(); 57 void startMultiSync();
58 void setCaptionToDates(); 58 void setCaptionToDates();
59 void weekAction(); 59 void weekAction();
60 void about(); 60 void about();
61 void licence(); 61 void licence();
62 void faq(); 62 void faq();
63 void usertrans(); 63 void usertrans();
64 void features(); 64 void features();
65 void synchowto(); 65 void synchowto();
66 void storagehowto(); 66 void storagehowto();
67 void timetrackinghowto(); 67 void timetrackinghowto();
68 void kdesynchowto(); 68 void kdesynchowto();
69 void multisynchowto(); 69 void multisynchowto();
70 void whatsNew(); 70 void whatsNew();
71 void keyBindings(); 71 void keyBindings();
72 void aboutAutoSaving();; 72 void aboutAutoSaving();;
73 void aboutKnownBugs(); 73 void aboutKnownBugs();
74 74
75 void processIncidenceSelection( Incidence * ); 75 void processIncidenceSelection( Incidence * );
76 76
77 void importQtopia(); 77 void importQtopia();
78 void importBday(); 78 void importBday();
79 void importOL(); 79 void importOL();
80 void importIcal(); 80 void importIcal();
81 void importFile( QString, bool ); 81 void importFile( QString, bool );
82 void quickImportIcal(); 82 void quickImportIcal();
83 83
84 void slotModifiedChanged( bool ); 84 void slotModifiedChanged( bool );
85 85
86 void save(); 86 void save();
87 void backupAllFiles(); 87 void backupAllFiles();
88 void saveStopTimer(); 88 void saveStopTimer();
89 void configureToolBar( int ); 89 void configureToolBar( int );
90 void printSel(); 90 void printSel();
91 void printCal(); 91 void printCal();
92 void printListView(); 92 void printListView();
93 void saveCalendar(); 93 void saveCalendar();
94 void loadCalendar(); 94 void loadCalendar();
95 void exportVCalendar(); 95 void exportVCalendar();
96 void exportICalendar();
97 void exportCalendar( bool );
96 void fillFilterMenu(); 98 void fillFilterMenu();
97 void fillFilterMenuTB(); 99 void fillFilterMenuTB();
98 void selectFilter( int ); 100 void selectFilter( int );
99 void fillFilterMenuPopup(); 101 void fillFilterMenuPopup();
100 void selectFilterPopup( int ); 102 void selectFilterPopup( int );
101 void exportToPhone( int ); 103 void exportToPhone( int );
102 void toggleBeamReceive(); 104 void toggleBeamReceive();
103 void disableBR(bool); 105 void disableBR(bool);
104 signals: 106 signals:
105 void selectWeek ( int ); 107 void selectWeek ( int );
106 private slots: 108 private slots:
107 void slotResetFocus(); 109 void slotResetFocus();
108 void slotResetFocusLoop(); 110 void slotResetFocusLoop();
109 void showConfigureAgenda(); 111 void showConfigureAgenda();
110 void getFile( bool ); 112 void getFile( bool );
111 void syncFileRequest(); 113 void syncFileRequest();
112 114
113 protected: 115 protected:
114 int mFocusLoop; 116 int mFocusLoop;
115 void hideEvent ( QHideEvent * ); 117 void hideEvent ( QHideEvent * );
116 QString sentSyncFile(); 118 QString sentSyncFile();
117 void displayText( QString, QString); 119 void displayText( QString, QString);
118 void enableIncidenceActions( bool ); 120 void enableIncidenceActions( bool );
121 bool askForQuitOnSaveError();
119 122
120 private: 123 private:
121 124
122 QCString mCStringMess; 125 QCString mCStringMess;
123 QByteArray mByteData; 126 QByteArray mByteData;
124 127
125 //void setMenuBar( QMenuBar * ); 128 //void setMenuBar( QMenuBar * );
126 bool mBRdisabled; 129 bool mBRdisabled;
127#ifndef DESKTOP_VERSION 130#ifndef DESKTOP_VERSION
128 QCopChannel* infrared; 131 QCopChannel* infrared;
129#endif 132#endif
130 QAction* brAction; 133 QAction* brAction;
131 KSyncManager* mSyncManager; 134 KSyncManager* mSyncManager;
132 bool mClosed; 135 bool mClosed;
133 void saveOnClose(); 136 void saveOnClose();
134 bool mFlagKeyPressed; 137 bool mFlagKeyPressed;
135 bool mBlockAtStartup; 138 bool mBlockAtStartup;
136 KMenuBar *menuBar1; 139 KMenuBar *menuBar1;
137 QPEToolBar *iconToolBar; 140 QPEToolBar *iconToolBar;
138 QPEToolBar *viewToolBar; 141 QPEToolBar *viewToolBar;
139 QPEToolBar *navigatorToolBar; 142 QPEToolBar *navigatorToolBar;
140 QPEToolBar *filterToolBar; 143 QPEToolBar *filterToolBar;
141 KMenuBar *filterMenubar; 144 KMenuBar *filterMenubar;
142 QPopupMenu * filterPopupMenu; 145 QPopupMenu * filterPopupMenu;
143 QPopupMenu * mCurrentItemMenu; 146 QPopupMenu * mCurrentItemMenu;
144 void initActions(); 147 void initActions();
145 void setDefaultPreferences(); 148 void setDefaultPreferences();
146 void resizeEvent( QResizeEvent* e); 149 void resizeEvent( QResizeEvent* e);
147 void keyPressEvent ( QKeyEvent * ) ; 150 void keyPressEvent ( QKeyEvent * ) ;
148 void keyReleaseEvent ( QKeyEvent * ) ; 151 void keyReleaseEvent ( QKeyEvent * ) ;
149 QPopupMenu *configureToolBarMenu; 152 QPopupMenu *configureToolBarMenu;
150 QPopupMenu *selectFilterMenu; 153 QPopupMenu *selectFilterMenu;
151 QPopupMenu *selectFilterMenuTB; 154 QPopupMenu *selectFilterMenuTB;
152 QPopupMenu *configureAgendaMenu, *syncMenu; 155 QPopupMenu *configureAgendaMenu, *syncMenu;
153 CalendarLocal *mCalendar; 156 CalendarLocal *mCalendar;
154 CalendarView *mView; 157 CalendarView *mView;
155 QAction *mNewSubTodoAction; 158 QAction *mNewSubTodoAction;
156 QAction *mWeekAction; 159 QAction *mWeekAction;
157 QFont mWeekFont; 160 QFont mWeekFont;
158 QPixmap mWeekPixmap; 161 QPixmap mWeekPixmap;
159 QColor mWeekBgColor; 162 QColor mWeekBgColor;
160 163
161 QAction *mShowAction; 164 QAction *mShowAction;
162 QAction *mEditAction; 165 QAction *mEditAction;
163 QAction *mDeleteAction; 166 QAction *mDeleteAction;
164 QAction *mCloneAction; 167 QAction *mCloneAction;
165 QAction *mMoveAction; 168 QAction *mMoveAction;
166 QAction *mBeamAction; 169 QAction *mBeamAction;
167 QAction *mCancelAction; 170 QAction *mCancelAction;
168 QAction *mPrintSelAction; 171 QAction *mPrintSelAction;
169 172
170 QAction *mToggleNav; 173 QAction *mToggleNav;
171 QAction *mToggleFilter; 174 QAction *mToggleFilter;
172 QAction *mToggleAllday; 175 QAction *mToggleAllday;
173 QAction *actionFilterMenuTB; 176 QAction *actionFilterMenuTB;
174 177
175 void closeEvent( QCloseEvent* ce ); 178 void closeEvent( QCloseEvent* ce );
176 QTimer mSaveTimer; 179 QTimer mSaveTimer;
177 QTime mSaveTime; 180 QDateTime mSaveTimerStart;
178 int mSaveDelay; 181 int mSaveDelay;
179 //bool mBlockSaveFlag; 182 //bool mBlockSaveFlag;
180 bool mCalendarModifiedFlag; 183 bool mCalendarModifiedFlag;
181 QPixmap loadPixmap( QString ); 184 QPixmap loadPixmap( QString );
182 QPixmap listviewPix, listviewPix0, listviewPix20, listviewPix40, listviewPix60, listviewPix80, journalPix; 185 QPixmap listviewPix, listviewPix0, listviewPix20, listviewPix40, listviewPix60, listviewPix80, journalPix;
183}; 186};
184 187
185 188
186#endif 189#endif