-rw-r--r-- | bin/kdepim/WhatsNew.txt | 4 | ||||
-rw-r--r-- | libkcal/sharpformat.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 1fd5364..1c5e83b 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,58 +1,60 @@ | |||
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.1.9 ************ | 3 | ********** VERSION 2.1.9 ************ |
4 | 4 | ||
5 | KO/Pi: | 5 | KO/Pi: |
6 | Fixed some problems of the new search options in the search dialog. | 6 | Fixed some problems of the new search options in the search dialog. |
7 | Fixed some problems in the new resource config options. | 7 | Fixed some problems in the new resource config options. |
8 | Changed the recurrence edit of events and todos such that the recurrence edit page now is notified about a change of the start date on the first page. | 8 | Changed the recurrence edit of events and todos such that the recurrence edit page now is notified about a change of the start date on the first page. |
9 | Fixed a problem creating new events in the agenda view if at the day/time is already an agenda item shown: | 9 | Fixed a problem creating new events in the agenda view if at the day/time is already an agenda item shown: |
10 | Now you can click on the bottom/top of an allday agenda item or on the left/right side of an agenda item to get the "new todo/new event" popup. | 10 | Now you can click on the bottom/top of an allday agenda item or on the left/right side of an agenda item to get the "new todo/new event" popup. |
11 | |||
12 | Fixed a problem in recurrence range in syncing with DTM. | ||
11 | 13 | ||
12 | 14 | ||
13 | PwM/Pi: | 15 | PwM/Pi: |
14 | Added "sec" to the timeout config settings to make it clear the timeout values are seconds. | 16 | Added "sec" to the timeout config settings to make it clear the timeout values are seconds. |
15 | 17 | ||
16 | ********** VERSION 2.1.8 ************ | 18 | ********** VERSION 2.1.8 ************ |
17 | 19 | ||
18 | KO/Pi: | 20 | KO/Pi: |
19 | Added info about the completion state of a todo in the ListView/Searchdialog. | 21 | Added info about the completion state of a todo in the ListView/Searchdialog. |
20 | If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well. | 22 | If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well. |
21 | Fixed some updating problems when changing the filter. | 23 | Fixed some updating problems when changing the filter. |
22 | 24 | ||
23 | KA/Pi: | 25 | KA/Pi: |
24 | In the addressee selection dialog now the formatted name is shown, if not empty. | 26 | In the addressee selection dialog now the formatted name is shown, if not empty. |
25 | Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category. | 27 | Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category. |
26 | Now in the addressee selection dialog a selected contact is remove with a single click from the selected list. | 28 | Now in the addressee selection dialog a selected contact is remove with a single click from the selected list. |
27 | 29 | ||
28 | Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored. | 30 | Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored. |
29 | Fixed the sorting for size in the file selector on the Z. | 31 | Fixed the sorting for size in the file selector on the Z. |
30 | 32 | ||
31 | Changed the color selection dialog on the Zaurus to a more user friendly version. | 33 | Changed the color selection dialog on the Zaurus to a more user friendly version. |
32 | 34 | ||
33 | ********** VERSION 2.1.7 ************ | 35 | ********** VERSION 2.1.7 ************ |
34 | 36 | ||
35 | KO/Pi: | 37 | KO/Pi: |
36 | Fixed several problems in the new Resource handling. | 38 | Fixed several problems in the new Resource handling. |
37 | Added more options to the search dialog. | 39 | Added more options to the search dialog. |
38 | Fixed a problem in the Month view. | 40 | Fixed a problem in the Month view. |
39 | Added more options to the dialog when setting a todo to stopped. | 41 | Added more options to the dialog when setting a todo to stopped. |
40 | 42 | ||
41 | Fixed two small problems in KO/Pi Alarm applet. | 43 | Fixed two small problems in KO/Pi Alarm applet. |
42 | 44 | ||
43 | ********** VERSION 2.1.6 ************ | 45 | ********** VERSION 2.1.6 ************ |
44 | 46 | ||
45 | This release is for testing only. | 47 | This release is for testing only. |
46 | 48 | ||
47 | KO/Pi: | 49 | KO/Pi: |
48 | Added to the list view (the list view is used in search dialog as well) the possibility to print it. | 50 | Added to the list view (the list view is used in search dialog as well) the possibility to print it. |
49 | Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view. | 51 | Added to the list view the possibility to hide entries, if you do not want to print all entries of the list view. |
50 | Added to the list view the possibility to add all subtodos of selected todos to an export/beam. | 52 | Added to the list view the possibility to add all subtodos of selected todos to an export/beam. |
51 | Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout. | 53 | Added to the search dialog the possibility to make an additive search such that you can get a better list for export/printout. |
52 | Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus. | 54 | Added to the search dialog the possibility to hide the checkboxes such that there is more space for the list view on the Zaurus. |
53 | Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly. | 55 | Fixed a problem in the AlarmTimer Applet: Now utf8 messages are displayed properly. |
54 | 56 | ||
55 | Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars. | 57 | Added support for multiple calendar files in KO/Pi. Only local ical (*.ics) files are supported as calendars. |
56 | In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later. | 58 | In the sync profile config it is still missing to specify a particular calendar to sync with this profile. That setting will be added later. |
57 | Now on every sync the set of calendars is synced which are enabled in the resource view. | 59 | Now on every sync the set of calendars is synced which are enabled in the resource view. |
58 | 60 | ||
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp index c2ee2c9..9b757f7 100644 --- a/libkcal/sharpformat.cpp +++ b/libkcal/sharpformat.cpp | |||
@@ -778,97 +778,97 @@ QString SharpFormat::getEventString( Event* event ) | |||
778 | break; | 778 | break; |
779 | case Recurrence::rMonthlyPos:// 2 | 779 | case Recurrence::rMonthlyPos:// 2 |
780 | list.append( "2" ); | 780 | list.append( "2" ); |
781 | list.append( QString::number( rec->frequency()) );//12 | 781 | list.append( QString::number( rec->frequency()) );//12 |
782 | 782 | ||
783 | writeEndDate = true; | 783 | writeEndDate = true; |
784 | { | 784 | { |
785 | int count = 1; | 785 | int count = 1; |
786 | QPtrList<Recurrence::rMonthPos> rmp; | 786 | QPtrList<Recurrence::rMonthPos> rmp; |
787 | rmp = rec->monthPositions(); | 787 | rmp = rec->monthPositions(); |
788 | if ( rmp.first()->negative ) | 788 | if ( rmp.first()->negative ) |
789 | count = 5 - rmp.first()->rPos - 1; | 789 | count = 5 - rmp.first()->rPos - 1; |
790 | else | 790 | else |
791 | count = rmp.first()->rPos - 1; | 791 | count = rmp.first()->rPos - 1; |
792 | list.append( QString::number( count ) ); | 792 | list.append( QString::number( count ) ); |
793 | 793 | ||
794 | } | 794 | } |
795 | 795 | ||
796 | list.append( "0" ); | 796 | list.append( "0" ); |
797 | break; | 797 | break; |
798 | case Recurrence::rMonthlyDay:// 3 | 798 | case Recurrence::rMonthlyDay:// 3 |
799 | list.append( "3" ); | 799 | list.append( "3" ); |
800 | list.append( QString::number( rec->frequency()) );//12 | 800 | list.append( QString::number( rec->frequency()) );//12 |
801 | list.append( "0" ); | 801 | list.append( "0" ); |
802 | list.append( "0" ); | 802 | list.append( "0" ); |
803 | writeEndDate = true; | 803 | writeEndDate = true; |
804 | break; | 804 | break; |
805 | case Recurrence::rYearlyMonth://4 | 805 | case Recurrence::rYearlyMonth://4 |
806 | list.append( "4" ); | 806 | list.append( "4" ); |
807 | list.append( QString::number( rec->frequency()) );//12 | 807 | list.append( QString::number( rec->frequency()) );//12 |
808 | list.append( "0" ); | 808 | list.append( "0" ); |
809 | list.append( "0" ); | 809 | list.append( "0" ); |
810 | writeEndDate = true; | 810 | writeEndDate = true; |
811 | break; | 811 | break; |
812 | 812 | ||
813 | default: | 813 | default: |
814 | list.append( "255" ); | 814 | list.append( "255" ); |
815 | list.append( QString() ); | 815 | list.append( QString() ); |
816 | list.append( "0" ); | 816 | list.append( "0" ); |
817 | list.append( QString() ); | 817 | list.append( QString() ); |
818 | list.append( "0" ); | 818 | list.append( "0" ); |
819 | list.append( "20991231T000000" ); | 819 | list.append( "20991231T000000" ); |
820 | break; | 820 | break; |
821 | } | 821 | } |
822 | if ( writeEndDate ) { | 822 | if ( writeEndDate ) { |
823 | 823 | ||
824 | if ( rec->endDate().isValid() ) { // 15 + 16 | 824 | if ( rec->endDate().isValid() ) { // 15 + 16 |
825 | list.append( "1" ); | 825 | list.append( "1" ); |
826 | list.append( dtToString( rec->endDate()) ); | 826 | list.append( dtToString( rec->endDate(), false ) ); |
827 | } else { | 827 | } else { |
828 | list.append( "0" ); | 828 | list.append( "0" ); |
829 | list.append( "20991231T000000" ); | 829 | list.append( "20991231T000000" ); |
830 | } | 830 | } |
831 | 831 | ||
832 | } | 832 | } |
833 | if ( event->doesFloat () ) { | 833 | if ( event->doesFloat () ) { |
834 | list.append( dtToString( event->dtStart(), false ).left( 8 )); | 834 | list.append( dtToString( event->dtStart(), false ).left( 8 )); |
835 | list.append( dtToString( event->dtEnd(), false ).left( 8 )); //6 | 835 | list.append( dtToString( event->dtEnd(), false ).left( 8 )); //6 |
836 | 836 | ||
837 | } | 837 | } |
838 | else { | 838 | else { |
839 | list.append( QString() ); | 839 | list.append( QString() ); |
840 | list.append( QString() ); | 840 | list.append( QString() ); |
841 | 841 | ||
842 | } | 842 | } |
843 | if (event->dtStart().date() == event->dtEnd().date() ) | 843 | if (event->dtStart().date() == event->dtEnd().date() ) |
844 | list.append( "0" ); | 844 | list.append( "0" ); |
845 | else | 845 | else |
846 | list.append( "1" ); | 846 | list.append( "1" ); |
847 | 847 | ||
848 | 848 | ||
849 | for(QStringList::Iterator it=list.begin(); | 849 | for(QStringList::Iterator it=list.begin(); |
850 | it!=list.end(); ++it){ | 850 | it!=list.end(); ++it){ |
851 | QString& s = (*it); | 851 | QString& s = (*it); |
852 | s.replace(QRegExp("\""), "\"\""); | 852 | s.replace(QRegExp("\""), "\"\""); |
853 | if(s.contains(QRegExp("[,\"\r\n]")) || s.stripWhiteSpace() != s){ | 853 | if(s.contains(QRegExp("[,\"\r\n]")) || s.stripWhiteSpace() != s){ |
854 | s.prepend('\"'); | 854 | s.prepend('\"'); |
855 | s.append('\"'); | 855 | s.append('\"'); |
856 | } else if(s.isEmpty() && !s.isNull()){ | 856 | } else if(s.isEmpty() && !s.isNull()){ |
857 | s = "\"\""; | 857 | s = "\"\""; |
858 | } | 858 | } |
859 | } | 859 | } |
860 | return list.join(","); | 860 | return list.join(","); |
861 | 861 | ||
862 | 862 | ||
863 | } | 863 | } |
864 | QString SharpFormat::getTodoString( Todo* todo ) | 864 | QString SharpFormat::getTodoString( Todo* todo ) |
865 | { | 865 | { |
866 | QStringList list; | 866 | QStringList list; |
867 | list.append( todo->getID("Sharp_DTM") ); | 867 | list.append( todo->getID("Sharp_DTM") ); |
868 | list.append( todo->categories().join(",") ); | 868 | list.append( todo->categories().join(",") ); |
869 | 869 | ||
870 | if ( todo->hasStartDate() ) { | 870 | if ( todo->hasStartDate() ) { |
871 | list.append( dtToString( todo->dtStart()) ); | 871 | list.append( dtToString( todo->dtStart()) ); |
872 | } else | 872 | } else |
873 | list.append( QString() ); | 873 | list.append( QString() ); |
874 | 874 | ||