-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 2 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 6723dc5..0b928ef 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1483,61 +1483,61 @@ | |||
1483 | { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, | 1483 | { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, |
1484 | { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, | 1484 | { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, |
1485 | { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, | 1485 | { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, |
1486 | { "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, | 1486 | { "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, |
1487 | { "\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","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" }, | 1487 | { "\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","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" }, |
1488 | { "Edit","Edit" }, | 1488 | { "Edit","Edit" }, |
1489 | { "Last Modified","Zuletzt geändert" }, | 1489 | { "Last Modified","Zuletzt geändert" }, |
1490 | { "Journal viewer","Journal Anzeige" }, | 1490 | { "Journal viewer","Journal Anzeige" }, |
1491 | { "Configure Calendar Files...","Konfiguriere Kalenderdateien..." }, | 1491 | { "Configure Calendar Files...","Konfiguriere Kalenderdateien..." }, |
1492 | { "You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." }, | 1492 | { "You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." }, |
1493 | { "Hide Completed","Verstecke erledigte Todos" }, | 1493 | { "Hide Completed","Verstecke erledigte Todos" }, |
1494 | { "Show not Running","Zeige nicht Laufende" }, | 1494 | { "Show not Running","Zeige nicht Laufende" }, |
1495 | { "Click to add new Todo","Klick für neues Todo!" }, | 1495 | { "Click to add new Todo","Klick für neues Todo!" }, |
1496 | { "Show next conflict for","Zeige nächsten Konflikt für" }, | 1496 | { "Show next conflict for","Zeige nächsten Konflikt für" }, |
1497 | { "All events","Alle Termine" }, | 1497 | { "All events","Alle Termine" }, |
1498 | { "Allday events","Ganztagestermine" }, | 1498 | { "Allday events","Ganztagestermine" }, |
1499 | { "Events with time","Termine mit Zeit" }, | 1499 | { "Events with time","Termine mit Zeit" }, |
1500 | { "No conflict found","Kein Konflikt gefunden" }, | 1500 | { "No conflict found","Kein Konflikt gefunden" }, |
1501 | { "Conflict %1 <-> %2","Konflikt %1 <-> %2" }, | 1501 | { "Conflict %1 <-> %2","Konflikt %1 <-> %2" }, |
1502 | { "<p><b>Q</b>: Show next date with conflicting events\n ","<p><b>Q</b>: Zeige nächstes Datum mit Terminen im Konflikt\n " }, | 1502 | { "<p><b>Q</b>: Show next date with conflicting events\n ","<p><b>Q</b>: Zeige nächstes Datum mit Terminen im Konflikt\n " }, |
1503 | { "Week view mode uses row layout","Wochenansicht Modus nutzt Reihenlayout" }, | 1503 | { "Week view mode uses row layout","Wochenansicht Modus nutzt Reihenlayout" }, |
1504 | { "The event\n%1\nconflicts with event\n%2\nat date\n%3.\n","Der Termin\n%1\nist im Konflikt mit Termin\n%2\nam Datum\n%3.\n" }, | 1504 | { "The event\n%1\nconflicts with event\n%2\nat date\n%3.\n","Der Termin\n%1\nist im Konflikt mit Termin\n%2\nam Datum\n%3.\n" }, |
1505 | { "KO/Pi Conflict delected","KO/Pi Konflikt erkannt" }, | 1505 | { "KO/Pi Conflict delected","KO/Pi Konflikt erkannt" }, |
1506 | { "Show date","Zeige Datum" }, | 1506 | { "Show date","Zeige Datum" }, |
1507 | { "No problem!","Null Problemo!" }, | 1507 | { "No problem!","Null Problemo!" }, |
1508 | { "Automatically sync with KDE-Desktop\nwhen receiving sync request","Synce automatisch mit KDE-Desktop\nwenn eine Sync-Anforderung kommt" }, | 1508 | { "Automatically sync with KDE-Desktop\nwhen receiving sync request","Synce automatisch mit KDE-Desktop\nwenn eine Sync-Anforderung kommt" }, |
1509 | { "Pi-Sync Port Error","Pi-Sync Port Fehler" }, | 1509 | { "Pi-Sync Port Error","Pi-Sync Port Fehler" }, |
1510 | { "<b>Enabling Pi-Sync failed!</b> Failed to bind or listen to the port %1! Is another instance already listening to that port?","<b>Anschalten von Pi-Sync fehlgeschlagen!</b> Fehler beim Ansprechen des Ports %1! Ist bereits eine andere Anwendung dabei diesen Port zu nutzen?" }, | 1510 | { "<b>Enabling Pi-Sync failed!</b> Failed to bind or listen to the port %1! Is another instance already listening to that port?","<b>Anschalten von Pi-Sync fehlgeschlagen!</b> Fehler beim Ansprechen des Ports %1! Ist bereits eine andere Anwendung dabei diesen Port zu nutzen?" }, |
1511 | { "No valid port number:\n%1","Keine gültige Port Nummer:\n%1" }, | 1511 | { "No valid port number:\n%1","Keine gültige Port Nummer:\n%1" }, |
1512 | { "Port number (Default: %1)\nValid range from 1 to 65535","Port Nummer (Standard: %1)\nGültiger Bereich von 1 bis 65535" }, | 1512 | { "Port number (Default: %1)\nValid range from 1 to 65535","Port Nummer (Standard: %1)\nGültiger Bereich von 1 bis 65535" }, |
1513 | { "Pi-Sync Error","Pi-Sync Fehler" }, | 1513 | { "Pi-Sync Error","Pi-Sync Fehler" }, |
1514 | { "Got send file request\nwith invalid password","Erhielt "sende Datei" Anfrage\nmit ungültigem Passwort" }, | 1514 | { "Got send file request\nwith invalid password","Erhielt "sende Datei" Anfrage\nmit ungültigem Passwort" }, |
1515 | { "Got receive file request\nwith invalid password","Erhielt "empfange Datei" Anfrage\nmit ungültigem Passwort" }, | 1515 | { "Got receive file request\nwith invalid password","Erhielt "empfange Datei" Anfrage\nmit ungültigem Passwort" }, |
1516 | { "Wrong password: Receiving remote file failed.","Falsches Passwort: Empfangen von entfernter Datei fehlgeschlagen." }, | 1516 | { "Wrong password: Receiving remote file failed.","Falsches Passwort: Empfangen von entfernter Datei fehlgeschlagen." }, |
1517 | { "Please close error dialog on remote.","Bitte schließe Fehler-Dialog am entfernten Rechner" }, | 1517 | { "Please close error dialog on remote.","Bitte schließe Fehler-Dialog am entfernten Rechner" }, |
1518 | { "Unknown error on remote.","Unbekannter Fehler am entfernten Rechner" }, | 1518 | { "Unknown error on remote.","Unbekannter Fehler am entfernten Rechner" }, |
1519 | { "Pi-Sync: Connected!","Pi-Sync: Verbunden!" }, | 1519 | { "Pi-Sync: Connected!","Pi-Sync: Verbunden!" }, |
1520 | { "Receiving file from remote...","Empfange entfernte Datei..." }, | 1520 | { "Receiving file from remote...","Empfange entfernte Datei..." }, |
1521 | { "Sending back synced file...","Sende synchronisierte Datei zurück..." }, | 1521 | { "Sending back synced file...","Sende synchronisierte Datei zurück..." }, |
1522 | { "Do you want to\nclear all sync info\nof all profiles?","Möchten Sie wirklich\ndie Sync-Info\nfür alle Profile\nlöschen?" }, | 1522 | { "Do you want to\nclear all sync info\nof all profiles?","Möchten Sie wirklich\ndie Sync-Info\nfür alle Profile\nlöschen?" }, |
1523 | { "Do you want to\nclear the sync\ninfo of profile\n%1?\n","Möchten Sie wirklich\ndie Sync-Info für Profil\n%1?\nlöschen" }, | 1523 | { "Do you want to\nclear the sync\ninfo of profile\n%1?\n","Möchten Sie wirklich\ndie Sync-Info für Profil\n%1?\nlöschen" }, |
1524 | { "Sorry, no valid port.Syncing cancelled.","Sorry, kein gültiger Port. Syncing abgebrochen." }, | 1524 | { "Sorry, no valid port.Syncing cancelled.","Sorry, kein gültiger Port. Syncing abgebrochen." }, |
1525 | { "Remote port number:\n(May be: 1 - 65535)","Ferne Port Nummer:\n(Darf sein: 1 - 65535)" }, | 1525 | { "Remote port number:\n(May be: 1 - 65535)","Ferne Port Nummer:\n(Darf sein: 1 - 65535)" }, |
1526 | { "Writing back file ...","Schreibe Datei zurück..." }, | 1526 | { "Writing back file ...","Schreibe Datei zurück..." }, |
1527 | { "Sending back file ...","Sende Datei zurück..." }, | 1527 | { "Sending back file ...","Sende Datei zurück..." }, |
1528 | { "Eeek, there I am ticklish!","Hihi, da bin ich kitzlig!" }, | 1528 | { "Eeek, there I am ticklish!","Hihi, da bin ich kitzlig!" }, |
1529 | { "Created","Angelegt" }, | 1529 | { "Created","Angelegt" }, |
1530 | { "Last Modified Sub","Zuletzt geändertes Sub" }, | 1530 | { "Last Modified Sub","Zuletzt geändertes Sub" }, |
1531 | { "","" }, | 1531 | { "Checking conflicts ... please wait","Überprüfe Konflikte ... bitte warten" }, |
1532 | { "","" }, | 1532 | { "","" }, |
1533 | { "","" }, | 1533 | { "","" }, |
1534 | { "","" }, | 1534 | { "","" }, |
1535 | { "","" }, | 1535 | { "","" }, |
1536 | { "","" }, | 1536 | { "","" }, |
1537 | { "","" }, | 1537 | { "","" }, |
1538 | { "","" }, | 1538 | { "","" }, |
1539 | { "","" }, | 1539 | { "","" }, |
1540 | { "","" }, | 1540 | { "","" }, |
1541 | { "","" }, | 1541 | { "","" }, |
1542 | { "","" }, | 1542 | { "","" }, |
1543 | { "","" }, | 1543 | { "","" }, |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index f9685e9..ab69158 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -632,97 +632,99 @@ void CalendarView::init() | |||
632 | mAlarmDialog = new AlarmDialog( this ); | 632 | mAlarmDialog = new AlarmDialog( this ); |
633 | connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString & ) ) ); | 633 | connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString & ) ) ); |
634 | mAlarmDialog->setServerNotification( false ); | 634 | mAlarmDialog->setServerNotification( false ); |
635 | mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime ); | 635 | mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime ); |
636 | 636 | ||
637 | 637 | ||
638 | #ifndef DESKTOP_VERSION | 638 | #ifndef DESKTOP_VERSION |
639 | //US listen for arriving address resultsets | 639 | //US listen for arriving address resultsets |
640 | connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), | 640 | connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), |
641 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); | 641 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); |
642 | #endif | 642 | #endif |
643 | mDateNavigator->setCalendar( mCalendar ); | 643 | mDateNavigator->setCalendar( mCalendar ); |
644 | } | 644 | } |
645 | 645 | ||
646 | 646 | ||
647 | CalendarView::~CalendarView() | 647 | CalendarView::~CalendarView() |
648 | { | 648 | { |
649 | // kdDebug() << "~CalendarView()" << endl; | 649 | // kdDebug() << "~CalendarView()" << endl; |
650 | //qDebug("CalendarView::~CalendarView() "); | 650 | //qDebug("CalendarView::~CalendarView() "); |
651 | delete mDialogManager; | 651 | delete mDialogManager; |
652 | delete mViewManager; | 652 | delete mViewManager; |
653 | delete mStorage; | 653 | delete mStorage; |
654 | delete mDateFrame ; | 654 | delete mDateFrame ; |
655 | delete mEventViewerDialog; | 655 | delete mEventViewerDialog; |
656 | //kdDebug() << "~CalendarView() done" << endl; | 656 | //kdDebug() << "~CalendarView() done" << endl; |
657 | } | 657 | } |
658 | void CalendarView::nextConflict( bool all, bool allday ) | 658 | void CalendarView::nextConflict( bool all, bool allday ) |
659 | { | 659 | { |
660 | 660 | ||
661 | QPtrList<Event> testlist = mCalendar->events(); | 661 | QPtrList<Event> testlist = mCalendar->events(); |
662 | Event * test = testlist.first(); | 662 | Event * test = testlist.first(); |
663 | while ( test ) { | 663 | while ( test ) { |
664 | test->setTagged( false ); | 664 | test->setTagged( false ); |
665 | test = testlist.next(); | 665 | test = testlist.next(); |
666 | } | 666 | } |
667 | QTime st ( 0,0,0); | 667 | QTime st ( 0,0,0); |
668 | if ( mViewManager->currentView() == mViewManager->agendaView() ) | 668 | if ( mViewManager->currentView() == mViewManager->agendaView() ) |
669 | st = mViewManager->agendaView()->agenda()->getEndTime(); | 669 | st = mViewManager->agendaView()->agenda()->getEndTime(); |
670 | //qDebug("time %s ", st.toString().latin1()); | 670 | //qDebug("time %s ", st.toString().latin1()); |
671 | QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st); | 671 | QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st); |
672 | QDateTime conflict; | 672 | QDateTime conflict; |
673 | QDateTime retVal; | 673 | QDateTime retVal; |
674 | bool found = false; | 674 | bool found = false; |
675 | Event * cE = 0; | 675 | Event * cE = 0; |
676 | Event * cE2 = 0; | 676 | Event * cE2 = 0; |
677 | QPtrList<Event> testlist2 = testlist; | 677 | QPtrList<Event> testlist2 = testlist; |
678 | test = testlist.first(); | 678 | test = testlist.first(); |
679 | bool skip = false; | 679 | bool skip = false; |
680 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); | ||
680 | while ( test ) { | 681 | while ( test ) { |
682 | qApp->processEvents(); | ||
681 | skip = false; | 683 | skip = false; |
682 | if ( !all ) skip = ( allday != test->doesFloat() ); | 684 | if ( !all ) skip = ( allday != test->doesFloat() ); |
683 | if ( !skip ) { | 685 | if ( !skip ) { |
684 | Event * test2 = testlist2.first(); | 686 | Event * test2 = testlist2.first(); |
685 | while ( test2 ) { | 687 | while ( test2 ) { |
686 | skip = false; | 688 | skip = false; |
687 | if ( !all ) skip = ( allday != test2->doesFloat() ); | 689 | if ( !all ) skip = ( allday != test2->doesFloat() ); |
688 | if ( !skip ) { | 690 | if ( !skip ) { |
689 | if ( !test2->isTagged() ) { | 691 | if ( !test2->isTagged() ) { |
690 | if ( test->isOverlapping ( test2, &retVal, &startDT ) ) { | 692 | if ( test->isOverlapping ( test2, &retVal, &startDT ) ) { |
691 | //qDebug("overlap "); | 693 | //qDebug("overlap "); |
692 | if ( ! found ) { | 694 | if ( ! found ) { |
693 | if ( retVal >= startDT ) { | 695 | if ( retVal >= startDT ) { |
694 | conflict = retVal; | 696 | conflict = retVal; |
695 | cE = test; | 697 | cE = test; |
696 | cE2 = test2; | 698 | cE2 = test2; |
697 | found = true; | 699 | found = true; |
698 | } | 700 | } |
699 | } else { | 701 | } else { |
700 | if ( retVal >= startDT && retVal < conflict ) { | 702 | if ( retVal >= startDT && retVal < conflict ) { |
701 | conflict = retVal; | 703 | conflict = retVal; |
702 | cE = test; | 704 | cE = test; |
703 | cE2 = test2; | 705 | cE2 = test2; |
704 | } | 706 | } |
705 | } | 707 | } |
706 | } | 708 | } |
707 | } | 709 | } |
708 | } | 710 | } |
709 | test2 = testlist2.next(); | 711 | test2 = testlist2.next(); |
710 | } | 712 | } |
711 | } | 713 | } |
712 | test->setTagged( true ); | 714 | test->setTagged( true ); |
713 | test = testlist.next(); | 715 | test = testlist.next(); |
714 | } | 716 | } |
715 | if ( found ) { | 717 | if ( found ) { |
716 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) | 718 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) |
717 | mViewManager->showDayView(); | 719 | mViewManager->showDayView(); |
718 | mNavigator->slotDaySelect( conflict.date() ); | 720 | mNavigator->slotDaySelect( conflict.date() ); |
719 | int hour = conflict.time().hour(); | 721 | int hour = conflict.time().hour(); |
720 | mViewManager->agendaView()->setStartHour( hour ); | 722 | mViewManager->agendaView()->setStartHour( hour ); |
721 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) ); | 723 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) ); |
722 | return; | 724 | return; |
723 | } | 725 | } |
724 | 726 | ||
725 | topLevelWidget()->setCaption( i18n("No conflict found") ); | 727 | topLevelWidget()->setCaption( i18n("No conflict found") ); |
726 | qDebug("No conflict found "); | 728 | qDebug("No conflict found "); |
727 | return; | 729 | return; |
728 | } | 730 | } |
@@ -2723,108 +2725,106 @@ void CalendarView::changeIncidenceDisplay(Incidence *which, int action) | |||
2723 | //qDebug(" CalendarView::changeIncidenceDisplay++++++++++++++++++++++++++ %d %d ",which, action ); | 2725 | //qDebug(" CalendarView::changeIncidenceDisplay++++++++++++++++++++++++++ %d %d ",which, action ); |
2724 | if ( action == KOGlobals::EVENTDELETED ) { //delete | 2726 | if ( action == KOGlobals::EVENTDELETED ) { //delete |
2725 | mCalendar->checkAlarmForIncidence( 0, true ); | 2727 | mCalendar->checkAlarmForIncidence( 0, true ); |
2726 | if ( mEventViewerDialog ) | 2728 | if ( mEventViewerDialog ) |
2727 | mEventViewerDialog->hide(); | 2729 | mEventViewerDialog->hide(); |
2728 | } | 2730 | } |
2729 | else | 2731 | else |
2730 | mCalendar->checkAlarmForIncidence( which , false ); | 2732 | mCalendar->checkAlarmForIncidence( which , false ); |
2731 | } | 2733 | } |
2732 | 2734 | ||
2733 | // most of the changeEventDisplays() right now just call the view's | 2735 | // most of the changeEventDisplays() right now just call the view's |
2734 | // total update mode, but they SHOULD be recoded to be more refresh-efficient. | 2736 | // total update mode, but they SHOULD be recoded to be more refresh-efficient. |
2735 | void CalendarView::changeEventDisplay(Event *which, int action) | 2737 | void CalendarView::changeEventDisplay(Event *which, int action) |
2736 | { | 2738 | { |
2737 | // kdDebug() << "CalendarView::changeEventDisplay" << endl; | 2739 | // kdDebug() << "CalendarView::changeEventDisplay" << endl; |
2738 | changeIncidenceDisplay((Incidence *)which, action); | 2740 | changeIncidenceDisplay((Incidence *)which, action); |
2739 | static bool clearallviews = false; | 2741 | static bool clearallviews = false; |
2740 | if ( KOPrefs::instance()->mGlobalUpdateDisabled ) { | 2742 | if ( KOPrefs::instance()->mGlobalUpdateDisabled ) { |
2741 | if ( clearallviews ) { | 2743 | if ( clearallviews ) { |
2742 | clearAllViews(); | 2744 | clearAllViews(); |
2743 | clearallviews = false; | 2745 | clearallviews = false; |
2744 | } | 2746 | } |
2745 | return; | 2747 | return; |
2746 | } | 2748 | } |
2747 | clearallviews = true; | 2749 | clearallviews = true; |
2748 | mDateNavigator->updateView(); | 2750 | mDateNavigator->updateView(); |
2749 | //mDialogManager->updateSearchDialog(); | 2751 | //mDialogManager->updateSearchDialog(); |
2750 | if (which) { | 2752 | if (which) { |
2751 | // If there is an event view visible update the display | 2753 | // If there is an event view visible update the display |
2752 | mViewManager->currentView()->changeEventDisplay(which,action); | 2754 | mViewManager->currentView()->changeEventDisplay(which,action); |
2753 | // TODO: check, if update needed | 2755 | // TODO: check, if update needed |
2754 | // if (which->getTodoStatus()) { | 2756 | // if (which->getTodoStatus()) { |
2755 | mTodoList->updateView(); | 2757 | mTodoList->updateView(); |
2756 | if ( action != KOGlobals::EVENTDELETED ) { | 2758 | if ( action != KOGlobals::EVENTDELETED ) { |
2757 | mConflictingEvent = which ; | 2759 | mConflictingEvent = which ; |
2758 | QTimer::singleShot( 1000, this, SLOT ( checkConflictForEvent() ) ); | 2760 | QTimer::singleShot( 1000, this, SLOT ( checkConflictForEvent() ) ); |
2759 | } | 2761 | } |
2760 | // } | 2762 | // } |
2761 | } else { | 2763 | } else { |
2762 | mViewManager->currentView()->updateView(); | 2764 | mViewManager->currentView()->updateView(); |
2763 | } | 2765 | } |
2764 | } | 2766 | } |
2765 | void CalendarView::checkConflictForEvent() | 2767 | void CalendarView::checkConflictForEvent() |
2766 | { | 2768 | { |
2767 | 2769 | ||
2768 | if (!KOPrefs::instance()->mConfirm) | 2770 | if (!KOPrefs::instance()->mConfirm) |
2769 | return; | 2771 | return; |
2770 | if ( ! mConflictingEvent ) return; | 2772 | if ( ! mConflictingEvent ) return; |
2771 | if ( mConflictingEvent->isHoliday() || mConflictingEvent->isBirthday() || mConflictingEvent->isAnniversary() ) { | 2773 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); |
2772 | mConflictingEvent = 0; | ||
2773 | return; | ||
2774 | } | ||
2775 | QPtrList<Event> testlist = mCalendar->events(); | 2774 | QPtrList<Event> testlist = mCalendar->events(); |
2776 | Event * test = testlist.first(); | 2775 | Event * test = testlist.first(); |
2777 | QDateTime conflict; | 2776 | QDateTime conflict; |
2778 | QDateTime retVal; | 2777 | QDateTime retVal; |
2779 | bool found = false; | 2778 | bool found = false; |
2780 | Event * cE = 0; | 2779 | Event * cE = 0; |
2781 | QDateTime current = QDateTime::currentDateTime(); | 2780 | QDateTime current = QDateTime::currentDateTime(); |
2782 | while ( test ) { | 2781 | while ( test ) { |
2782 | qApp->processEvents(); | ||
2783 | if ( !test->doesFloat() ) { | 2783 | if ( !test->doesFloat() ) { |
2784 | if ( mConflictingEvent->isOverlapping ( test, &retVal, ¤t ) ) { | 2784 | if ( mConflictingEvent->isOverlapping ( test, &retVal, ¤t ) ) { |
2785 | if ( ! found ) { | 2785 | if ( ! found ) { |
2786 | conflict = retVal; | 2786 | conflict = retVal; |
2787 | cE = test; | 2787 | cE = test; |
2788 | } else { | 2788 | } else { |
2789 | if ( retVal < conflict ) { | 2789 | if ( retVal < conflict ) { |
2790 | conflict = retVal; | 2790 | conflict = retVal; |
2791 | cE = test; | 2791 | cE = test; |
2792 | } | 2792 | } |
2793 | } | 2793 | } |
2794 | found = true; | 2794 | found = true; |
2795 | } | 2795 | } |
2796 | } | 2796 | } |
2797 | test = testlist.next(); | 2797 | test = testlist.next(); |
2798 | } | 2798 | } |
2799 | if ( found ) { | 2799 | if ( found ) { |
2800 | QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( mConflictingEvent->summary(),0 ) ).arg( KGlobal::formatMessage ( cE->summary(),0 )).arg(KGlobal::locale()->formatDate(conflict.date()) ) ; | 2800 | QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( mConflictingEvent->summary(),0 ) ).arg( KGlobal::formatMessage ( cE->summary(),0 )).arg(KGlobal::locale()->formatDate(conflict.date()) ) ; |
2801 | qApp->processEvents(); | 2801 | qApp->processEvents(); |
2802 | int km = KMessageBox::warningContinueCancel(this,mess, | 2802 | int km = KMessageBox::warningContinueCancel(this,mess, |
2803 | i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!")); | 2803 | i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!")); |
2804 | if ( km != KMessageBox::Continue ) | 2804 | if ( km != KMessageBox::Continue ) |
2805 | return; | 2805 | return; |
2806 | 2806 | ||
2807 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) | 2807 | if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 ) |
2808 | mViewManager->showDayView(); | 2808 | mViewManager->showDayView(); |
2809 | mNavigator->slotDaySelect( conflict.date() ); | 2809 | mNavigator->slotDaySelect( conflict.date() ); |
2810 | int hour = conflict.time().hour(); | 2810 | int hour = conflict.time().hour(); |
2811 | mViewManager->agendaView()->setStartHour( hour ); | 2811 | mViewManager->agendaView()->setStartHour( hour ); |
2812 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) ); | 2812 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) ); |
2813 | } | 2813 | } |
2814 | mConflictingEvent = 0; | 2814 | mConflictingEvent = 0; |
2815 | return; | 2815 | return; |
2816 | 2816 | ||
2817 | } | 2817 | } |
2818 | 2818 | ||
2819 | void CalendarView::updateTodoViews() | 2819 | void CalendarView::updateTodoViews() |
2820 | { | 2820 | { |
2821 | mTodoList->updateView(); | 2821 | mTodoList->updateView(); |
2822 | mViewManager->currentView()->updateView(); | 2822 | mViewManager->currentView()->updateView(); |
2823 | 2823 | ||
2824 | } | 2824 | } |
2825 | 2825 | ||
2826 | 2826 | ||
2827 | 2827 | ||
2828 | void CalendarView::clearAllViews() | 2828 | void CalendarView::clearAllViews() |
2829 | { | 2829 | { |
2830 | mTodoList->clearList(); | 2830 | mTodoList->clearList(); |