-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,21 +1,25 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.0.16 ************ | 3 | ********** VERSION 2.0.16 ************ |
4 | OM/Pi: | 4 | OM/Pi: |
5 | Fixed the SMTP account setting the option. | 5 | Fixed the SMTP account setting the option. |
6 | Fixed something in mail sending. | ||
7 | |||
8 | KO/Pi: | ||
9 | Added possibility to export selected events/todos as vcal file. | ||
6 | 10 | ||
7 | ********** VERSION 2.0.15 ************ | 11 | ********** VERSION 2.0.15 ************ |
8 | 12 | ||
9 | PwM/Pi: | 13 | PwM/Pi: |
10 | Added keyboard shorcuts for | 14 | Added keyboard shorcuts for |
11 | - toggling summary view (space bar) | 15 | - toggling summary view (space bar) |
12 | - delete item (delete + backspace key) | 16 | - delete item (delete + backspace key) |
13 | - add new item ( i + n key) | 17 | - add new item ( i + n key) |
14 | Fixed length of info in the title. | 18 | Fixed length of info in the title. |
15 | 19 | ||
16 | KO/Pi-KA/Pi: | 20 | KO/Pi-KA/Pi: |
17 | Changed "ME" menu bar entry to an icon. | 21 | Changed "ME" menu bar entry to an icon. |
18 | 22 | ||
19 | KO/Pi: | 23 | KO/Pi: |
20 | Fixed two minor bugs in displaying todos. | 24 | Fixed two minor bugs in displaying todos. |
21 | If in month view a cell is selected, the key shortcut "d" shows now that date. | 25 | If in month view a cell is selected, the key shortcut "d" shows now that date. |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index f235705..3519985 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -609,40 +609,51 @@ void KOListView::saveDescriptionToFile() | |||
609 | } | 609 | } |
610 | } | 610 | } |
611 | void KOListView::saveToFileVCS() | 611 | void KOListView::saveToFileVCS() |
612 | { | 612 | { |
613 | writeToFile( false ); | 613 | writeToFile( false ); |
614 | } | 614 | } |
615 | void KOListView::saveToFile() | 615 | void KOListView::saveToFile() |
616 | { | 616 | { |
617 | writeToFile( true ); | 617 | writeToFile( true ); |
618 | } | 618 | } |
619 | void KOListView::writeToFile( bool iCal ) | 619 | void KOListView::writeToFile( bool iCal ) |
620 | { | 620 | { |
621 | 621 | ||
622 | int icount = 0; | 622 | int icount = 0; |
623 | QPtrList<Incidence> delSel ; | 623 | QPtrList<Incidence> delSel ; |
624 | QListViewItem *item = mListView->firstChild (); | 624 | QListViewItem *item = mListView->firstChild (); |
625 | bool journal = iCal; // warn only for vCal | ||
625 | while ( item ) { | 626 | while ( item ) { |
626 | if ( item->isSelected() ) { | 627 | if ( item->isSelected() ) { |
628 | if ( !journal ) | ||
629 | if ( ((KOListViewItem *)item)->data()->type() == "Journal") | ||
630 | journal = true; | ||
627 | delSel.append(((KOListViewItem *)item)->data()); | 631 | delSel.append(((KOListViewItem *)item)->data()); |
628 | ++icount; | 632 | ++icount; |
629 | } | 633 | } |
630 | 634 | ||
631 | item = item->nextSibling(); | 635 | item = item->nextSibling(); |
632 | } | 636 | } |
637 | if ( !iCal && journal ) { | ||
638 | int result = KMessageBox::warningContinueCancel(this, | ||
639 | i18n("The journal entries can not be\nexported to a vCalendar file."), | ||
640 | i18n("Data Loss Warning"),i18n("Proceed"),i18n("Cancel"), | ||
641 | true); | ||
642 | if (result != KMessageBox::Continue) return; | ||
643 | } | ||
633 | if ( icount ) { | 644 | if ( icount ) { |
634 | QString fn = KOPrefs::instance()->mLastSaveFile; | 645 | QString fn = KOPrefs::instance()->mLastSaveFile; |
635 | QString extension; | 646 | QString extension; |
636 | if ( iCal ) { | 647 | if ( iCal ) { |
637 | if ( fn.right( 4 ).lower() == ".vcs" ) { | 648 | if ( fn.right( 4 ).lower() == ".vcs" ) { |
638 | fn = fn.left( fn.length() -3) + "ics"; | 649 | fn = fn.left( fn.length() -3) + "ics"; |
639 | } | 650 | } |
640 | } else { | 651 | } else { |
641 | if ( fn.right( 4 ).lower() == ".ics" ) { | 652 | if ( fn.right( 4 ).lower() == ".ics" ) { |
642 | fn = fn.left( fn.length() -3) + "vcs"; | 653 | fn = fn.left( fn.length() -3) + "vcs"; |
643 | } | 654 | } |
644 | } | 655 | } |
645 | fn = KFileDialog::getSaveFileName( fn, i18n("Save filename"), this ); | 656 | fn = KFileDialog::getSaveFileName( fn, i18n("Save filename"), this ); |
646 | 657 | ||
647 | if ( fn == "" ) | 658 | if ( fn == "" ) |
648 | return; | 659 | return; |
@@ -658,32 +669,33 @@ void KOListView::writeToFile( bool iCal ) | |||
658 | if ( result != 0 ) { | 669 | if ( result != 0 ) { |
659 | createbup = false; | 670 | createbup = false; |
660 | } | 671 | } |
661 | } | 672 | } |
662 | if ( createbup ) { | 673 | if ( createbup ) { |
663 | CalendarLocal cal; | 674 | CalendarLocal cal; |
664 | cal.setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); | 675 | cal.setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
665 | Incidence *incidence = delSel.first(); | 676 | Incidence *incidence = delSel.first(); |
666 | while ( incidence ) { | 677 | while ( incidence ) { |
667 | cal.addIncidence( incidence->clone() ); | 678 | cal.addIncidence( incidence->clone() ); |
668 | incidence = delSel.next(); | 679 | incidence = delSel.next(); |
669 | } | 680 | } |
670 | if ( iCal ) { | 681 | if ( iCal ) { |
671 | ICalFormat format; | 682 | ICalFormat format; |
672 | format.save( &cal, fn ); | 683 | format.save( &cal, fn ); |
673 | } else { | 684 | } else { |
685 | |||
674 | VCalFormat format; | 686 | VCalFormat format; |
675 | format.save( &cal, fn ); | 687 | format.save( &cal, fn ); |
676 | } | 688 | } |
677 | mes = i18n("KO/Pi:Saved %1").arg(fn ); | 689 | mes = i18n("KO/Pi:Saved %1").arg(fn ); |
678 | KOPrefs::instance()->mLastSaveFile = fn; | 690 | KOPrefs::instance()->mLastSaveFile = fn; |
679 | topLevelWidget()->setCaption(mes); | 691 | topLevelWidget()->setCaption(mes); |
680 | } | 692 | } |
681 | } | 693 | } |
682 | } | 694 | } |
683 | void KOListView::deleteAll() | 695 | void KOListView::deleteAll() |
684 | { | 696 | { |
685 | int icount = 0; | 697 | int icount = 0; |
686 | QPtrList<Incidence> delSel ; | 698 | QPtrList<Incidence> delSel ; |
687 | QListViewItem *item = mListView->firstChild (); | 699 | QListViewItem *item = mListView->firstChild (); |
688 | while ( item ) { | 700 | while ( item ) { |
689 | if ( item->isSelected() ) { | 701 | if ( item->isSelected() ) { |