| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 4 | ||||
| -rw-r--r-- | korganizer/kolistview.cpp | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index e769bd8..ef53ad9 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -1,11 +1,15 @@ Info about the changes in new versions of KDE-Pim/Pi ********** VERSION 2.0.16 ************ OM/Pi: Fixed the SMTP account setting the option. +Fixed something in mail sending. + +KO/Pi: +Added possibility to export selected events/todos as vcal file. ********** VERSION 2.0.15 ************ PwM/Pi: Added keyboard shorcuts for - toggling summary view (space bar) diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index f235705..3519985 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -619,20 +619,31 @@ void KOListView::saveToFile() void KOListView::writeToFile( bool iCal ) { int icount = 0; QPtrList<Incidence> delSel ; QListViewItem *item = mListView->firstChild (); + bool journal = iCal; // warn only for vCal while ( item ) { if ( item->isSelected() ) { + if ( !journal ) + if ( ((KOListViewItem *)item)->data()->type() == "Journal") + journal = true; delSel.append(((KOListViewItem *)item)->data()); ++icount; } item = item->nextSibling(); } + if ( !iCal && journal ) { + int result = KMessageBox::warningContinueCancel(this, + i18n("The journal entries can not be\nexported to a vCalendar file."), + i18n("Data Loss Warning"),i18n("Proceed"),i18n("Cancel"), + true); + if (result != KMessageBox::Continue) return; + } if ( icount ) { QString fn = KOPrefs::instance()->mLastSaveFile; QString extension; if ( iCal ) { if ( fn.right( 4 ).lower() == ".vcs" ) { fn = fn.left( fn.length() -3) + "ics"; @@ -668,12 +679,13 @@ void KOListView::writeToFile( bool iCal ) incidence = delSel.next(); } if ( iCal ) { ICalFormat format; format.save( &cal, fn ); } else { + VCalFormat format; format.save( &cal, fn ); } mes = i18n("KO/Pi:Saved %1").arg(fn ); KOPrefs::instance()->mLastSaveFile = fn; topLevelWidget()->setCaption(mes); |