summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt4
-rw-r--r--korganizer/kolistview.cpp12
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
@@ -5,2 +5,6 @@ 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.
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index f235705..3519985 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -624,4 +624,8 @@ void KOListView::writeToFile( bool iCal )
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());
@@ -632,2 +636,9 @@ void KOListView::writeToFile( bool iCal )
}
+ 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 ) {
@@ -673,2 +684,3 @@ void KOListView::writeToFile( bool iCal )
} else {
+
VCalFormat format;