author | zautrix <zautrix> | 2005-07-30 16:36:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-30 16:36:00 (UTC) |
commit | bd2ab556e1a5066524d797856e6a13358155e24b (patch) (side-by-side diff) | |
tree | 334d20a72ff2912d1a49d04671aa73bb424ca539 /korganizer | |
parent | 6a32c95e5f0a36cd9a681a3f3302bec6e83acce5 (diff) | |
download | kdepimpi-bd2ab556e1a5066524d797856e6a13358155e24b.zip kdepimpi-bd2ab556e1a5066524d797856e6a13358155e24b.tar.gz kdepimpi-bd2ab556e1a5066524d797856e6a13358155e24b.tar.bz2 |
bugfix
-rw-r--r-- | korganizer/calendarview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 28649d9..a1b1d71 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -3365,65 +3365,65 @@ void CalendarView::cloneIncidence(Incidence * orgInc ) if ( result == KMessageBox::Cancel ) { delete t; return; } if (result == KMessageBox::Yes) cloneSub = true; } showTodoEditor(); mTodoEditor->editTodo( t ); if ( mTodoEditor->exec() ) { if ( cloneSub ) { orgInc->cloneRelations( t ); mCalendar->addIncidenceBranch( t ); updateView(); } else { mCalendar->addTodo( t ); updateView(); } } else { delete t; } } else if ( newInc->typeID() == eventID ) { Event* e = (Event*) newInc; showEventEditor(); mEventEditor->editEvent( e ); if ( mEventEditor->exec() ) { mCalendar->addEvent( e ); updateView(); } else { delete e; } - } if ( newInc->typeID() == journalID ) { + } else if ( newInc->typeID() == journalID ) { mCalendar->addJournal( (Journal*) newInc ); editJournal( (Journal*) newInc ); } setActiveWindow(); } void CalendarView::newEvent() { // TODO: Replace this code by a common eventDurationHint of KOBaseView. KOAgendaView *aView = mViewManager->agendaView(); if (aView) { if (aView->selectionStart().isValid()) { if (aView->selectedIsAllDay()) { newEvent(aView->selectionStart(),aView->selectionEnd(),true); } else { newEvent(aView->selectionStart(),aView->selectionEnd()); } return; } } QDate date = mNavigator->selectedDates().first(); #if 0 QDateTime current = QDateTime::currentDateTime(); if ( date <= current.date() ) { int hour = current.time().hour() +1; newEvent( QDateTime( current.date(), QTime( hour, 0, 0 ) ), QDateTime( current.date(), QTime( hour+ KOPrefs::instance()->mDefaultDuration, 0, 0 ) ) ); } else #endif newEvent( QDateTime( date, QTime( KOPrefs::instance()->mStartTime, 0, 0 ) ), QDateTime( date, QTime( KOPrefs::instance()->mStartTime + |