author | zautrix <zautrix> | 2005-06-26 08:17:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-26 08:17:08 (UTC) |
commit | f27e8c6cc8abbd27f10167334d608c7e0af7f711 (patch) (unidiff) | |
tree | b516d5512178f98d105a5d77f96aff29dfe09c02 | |
parent | 6d8fdbda8cb12b768932a80ccd25d275bc4b30f9 (diff) | |
download | kdepimpi-f27e8c6cc8abbd27f10167334d608c7e0af7f711.zip kdepimpi-f27e8c6cc8abbd27f10167334d608c7e0af7f711.tar.gz kdepimpi-f27e8c6cc8abbd27f10167334d608c7e0af7f711.tar.bz2 |
rec fix
-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,34 +1,36 @@ | |||
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 | ||
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp index c2ee2c9..9b757f7 100644 --- a/libkcal/sharpformat.cpp +++ b/libkcal/sharpformat.cpp | |||
@@ -802,49 +802,49 @@ QString SharpFormat::getEventString( Event* event ) | |||
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){ |