-rw-r--r-- | korganizer/calendarview.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7566c6f..4b3f806 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -3952,102 +3952,100 @@ bool CalendarView::exportVCalendar( QString filename ) | |||
3952 | //QString filename = KFileDialog::getSaveFileName("vcalout.vcs",i18n("*.vcs|VCalendars"),this); | 3952 | //QString filename = KFileDialog::getSaveFileName("vcalout.vcs",i18n("*.vcs|VCalendars"),this); |
3953 | 3953 | ||
3954 | // Force correct extension | 3954 | // Force correct extension |
3955 | if (filename.right(4) != ".vcs") filename += ".vcs"; | 3955 | if (filename.right(4) != ".vcs") filename += ".vcs"; |
3956 | 3956 | ||
3957 | FileStorage storage( mCalendar, filename, new VCalFormat ); | 3957 | FileStorage storage( mCalendar, filename, new VCalFormat ); |
3958 | return storage.save(); | 3958 | return storage.save(); |
3959 | 3959 | ||
3960 | } | 3960 | } |
3961 | 3961 | ||
3962 | void CalendarView::eventUpdated(Incidence *) | 3962 | void CalendarView::eventUpdated(Incidence *) |
3963 | { | 3963 | { |
3964 | setModified(); | 3964 | setModified(); |
3965 | // Don't call updateView here. The code, which has caused the update of the | 3965 | // Don't call updateView here. The code, which has caused the update of the |
3966 | // event is responsible for updating the view. | 3966 | // event is responsible for updating the view. |
3967 | // updateView(); | 3967 | // updateView(); |
3968 | } | 3968 | } |
3969 | 3969 | ||
3970 | void CalendarView::adaptNavigationUnits() | 3970 | void CalendarView::adaptNavigationUnits() |
3971 | { | 3971 | { |
3972 | if (mViewManager->currentView()->isEventView()) { | 3972 | if (mViewManager->currentView()->isEventView()) { |
3973 | int days = mViewManager->currentView()->currentDateCount(); | 3973 | int days = mViewManager->currentView()->currentDateCount(); |
3974 | if (days == 1) { | 3974 | if (days == 1) { |
3975 | emit changeNavStringPrev(i18n("&Previous Day")); | 3975 | emit changeNavStringPrev(i18n("&Previous Day")); |
3976 | emit changeNavStringNext(i18n("&Next Day")); | 3976 | emit changeNavStringNext(i18n("&Next Day")); |
3977 | } else { | 3977 | } else { |
3978 | emit changeNavStringPrev(i18n("&Previous Week")); | 3978 | emit changeNavStringPrev(i18n("&Previous Week")); |
3979 | emit changeNavStringNext(i18n("&Next Week")); | 3979 | emit changeNavStringNext(i18n("&Next Week")); |
3980 | } | 3980 | } |
3981 | } | 3981 | } |
3982 | } | 3982 | } |
3983 | 3983 | ||
3984 | void CalendarView::processMainViewSelection( Incidence *incidence ) | 3984 | void CalendarView::processMainViewSelection( Incidence *incidence ) |
3985 | { | 3985 | { |
3986 | if ( incidence ) mTodoList->clearSelection(); | 3986 | if ( incidence ) mTodoList->clearSelection(); |
3987 | processIncidenceSelection( incidence ); | 3987 | processIncidenceSelection( incidence ); |
3988 | } | 3988 | } |
3989 | 3989 | ||
3990 | void CalendarView::processTodoListSelection( Incidence *incidence ) | 3990 | void CalendarView::processTodoListSelection( Incidence *incidence ) |
3991 | { | 3991 | { |
3992 | if ( incidence && mViewManager->currentView() ) { | 3992 | if ( incidence && mViewManager->currentView() ) { |
3993 | mViewManager->currentView()->clearSelection(); | 3993 | mViewManager->currentView()->clearSelection(); |
3994 | } | 3994 | } |
3995 | processIncidenceSelection( incidence ); | 3995 | processIncidenceSelection( incidence ); |
3996 | } | 3996 | } |
3997 | 3997 | ||
3998 | void CalendarView::processIncidenceSelection( Incidence *incidence ) | 3998 | void CalendarView::processIncidenceSelection( Incidence *incidence ) |
3999 | { | 3999 | { |
4000 | emit incidenceSelected( incidence ); | ||
4000 | if ( incidence == mSelectedIncidence ) return; | 4001 | if ( incidence == mSelectedIncidence ) return; |
4001 | |||
4002 | mSelectedIncidence = incidence; | 4002 | mSelectedIncidence = incidence; |
4003 | 4003 | ||
4004 | emit incidenceSelected( mSelectedIncidence ); | ||
4005 | |||
4006 | if ( incidence && incidence->typeID() == eventID ) { | 4004 | if ( incidence && incidence->typeID() == eventID ) { |
4007 | Event *event = static_cast<Event *>( incidence ); | 4005 | Event *event = static_cast<Event *>( incidence ); |
4008 | if ( event->organizer() == KOPrefs::instance()->email() ) { | 4006 | if ( event->organizer() == KOPrefs::instance()->email() ) { |
4009 | emit organizerEventsSelected( true ); | 4007 | emit organizerEventsSelected( true ); |
4010 | } else { | 4008 | } else { |
4011 | emit organizerEventsSelected(false); | 4009 | emit organizerEventsSelected(false); |
4012 | } | 4010 | } |
4013 | if (event->attendeeByMails( KOPrefs::instance()->mAdditionalMails, | 4011 | if (event->attendeeByMails( KOPrefs::instance()->mAdditionalMails, |
4014 | KOPrefs::instance()->email() ) ) { | 4012 | KOPrefs::instance()->email() ) ) { |
4015 | emit groupEventsSelected( true ); | 4013 | emit groupEventsSelected( true ); |
4016 | } else { | 4014 | } else { |
4017 | emit groupEventsSelected(false); | 4015 | emit groupEventsSelected(false); |
4018 | } | 4016 | } |
4019 | return; | 4017 | return; |
4020 | } else { | 4018 | } else { |
4021 | if ( incidence && incidence->typeID() == todoID ) { | 4019 | if ( incidence && incidence->typeID() == todoID ) { |
4022 | emit todoSelected( true ); | 4020 | emit todoSelected( true ); |
4023 | Todo *event = static_cast<Todo *>( incidence ); | 4021 | Todo *event = static_cast<Todo *>( incidence ); |
4024 | if ( event->organizer() == KOPrefs::instance()->email() ) { | 4022 | if ( event->organizer() == KOPrefs::instance()->email() ) { |
4025 | emit organizerEventsSelected( true ); | 4023 | emit organizerEventsSelected( true ); |
4026 | } else { | 4024 | } else { |
4027 | emit organizerEventsSelected(false); | 4025 | emit organizerEventsSelected(false); |
4028 | } | 4026 | } |
4029 | if (event->attendeeByMails( KOPrefs::instance()->mAdditionalMails, | 4027 | if (event->attendeeByMails( KOPrefs::instance()->mAdditionalMails, |
4030 | KOPrefs::instance()->email() ) ) { | 4028 | KOPrefs::instance()->email() ) ) { |
4031 | emit groupEventsSelected( true ); | 4029 | emit groupEventsSelected( true ); |
4032 | } else { | 4030 | } else { |
4033 | emit groupEventsSelected(false); | 4031 | emit groupEventsSelected(false); |
4034 | } | 4032 | } |
4035 | return; | 4033 | return; |
4036 | } else { | 4034 | } else { |
4037 | emit todoSelected( false ); | 4035 | emit todoSelected( false ); |
4038 | emit organizerEventsSelected(false); | 4036 | emit organizerEventsSelected(false); |
4039 | emit groupEventsSelected(false); | 4037 | emit groupEventsSelected(false); |
4040 | } | 4038 | } |
4041 | return; | 4039 | return; |
4042 | } | 4040 | } |
4043 | 4041 | ||
4044 | /* if ( incidence && incidence->typeID() == todoID ) { | 4042 | /* if ( incidence && incidence->typeID() == todoID ) { |
4045 | emit todoSelected( true ); | 4043 | emit todoSelected( true ); |
4046 | } else { | 4044 | } else { |
4047 | emit todoSelected( false ); | 4045 | emit todoSelected( false ); |
4048 | }*/ | 4046 | }*/ |
4049 | } | 4047 | } |
4050 | 4048 | ||
4051 | 4049 | ||
4052 | void CalendarView::checkClipboard() | 4050 | void CalendarView::checkClipboard() |
4053 | { | 4051 | { |