summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-26 08:17:08 (UTC)
committer zautrix <zautrix>2005-06-26 08:17:08 (UTC)
commitf27e8c6cc8abbd27f10167334d608c7e0af7f711 (patch) (side-by-side diff)
treeb516d5512178f98d105a5d77f96aff29dfe09c02
parent6d8fdbda8cb12b768932a80ccd25d275bc4b30f9 (diff)
downloadkdepimpi-f27e8c6cc8abbd27f10167334d608c7e0af7f711.zip
kdepimpi-f27e8c6cc8abbd27f10167334d608c7e0af7f711.tar.gz
kdepimpi-f27e8c6cc8abbd27f10167334d608c7e0af7f711.tar.bz2
rec fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt4
-rw-r--r--libkcal/sharpformat.cpp2
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,42 +1,44 @@
Info about the changes in new versions of KDE-Pim/Pi
********** VERSION 2.1.9 ************
KO/Pi:
Fixed some problems of the new search options in the search dialog.
Fixed some problems in the new resource config options.
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.
Fixed a problem creating new events in the agenda view if at the day/time is already an agenda item shown:
-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.
+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.
+
+Fixed a problem in recurrence range in syncing with DTM.
PwM/Pi:
Added "sec" to the timeout config settings to make it clear the timeout values are seconds.
********** VERSION 2.1.8 ************
KO/Pi:
Added info about the completion state of a todo in the ListView/Searchdialog.
If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well.
Fixed some updating problems when changing the filter.
KA/Pi:
In the addressee selection dialog now the formatted name is shown, if not empty.
Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category.
Now in the addressee selection dialog a selected contact is remove with a single click from the selected list.
Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored.
Fixed the sorting for size in the file selector on the Z.
Changed the color selection dialog on the Zaurus to a more user friendly version.
********** VERSION 2.1.7 ************
KO/Pi:
Fixed several problems in the new Resource handling.
Added more options to the search dialog.
Fixed a problem in the Month view.
Added more options to the dialog when setting a todo to stopped.
Fixed two small problems in KO/Pi Alarm applet.
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index c2ee2c9..9b757f7 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -794,65 +794,65 @@ QString SharpFormat::getEventString( Event* event )
}
list.append( "0" );
break;
case Recurrence::rMonthlyDay:// 3
list.append( "3" );
list.append( QString::number( rec->frequency()) );//12
list.append( "0" );
list.append( "0" );
writeEndDate = true;
break;
case Recurrence::rYearlyMonth://4
list.append( "4" );
list.append( QString::number( rec->frequency()) );//12
list.append( "0" );
list.append( "0" );
writeEndDate = true;
break;
default:
list.append( "255" );
list.append( QString() );
list.append( "0" );
list.append( QString() );
list.append( "0" );
list.append( "20991231T000000" );
break;
}
if ( writeEndDate ) {
if ( rec->endDate().isValid() ) { // 15 + 16
list.append( "1" );
- list.append( dtToString( rec->endDate()) );
+ list.append( dtToString( rec->endDate(), false ) );
} else {
list.append( "0" );
list.append( "20991231T000000" );
}
}
if ( event->doesFloat () ) {
list.append( dtToString( event->dtStart(), false ).left( 8 ));
list.append( dtToString( event->dtEnd(), false ).left( 8 )); //6
}
else {
list.append( QString() );
list.append( QString() );
}
if (event->dtStart().date() == event->dtEnd().date() )
list.append( "0" );
else
list.append( "1" );
for(QStringList::Iterator it=list.begin();
it!=list.end(); ++it){
QString& s = (*it);
s.replace(QRegExp("\""), "\"\"");
if(s.contains(QRegExp("[,\"\r\n]")) || s.stripWhiteSpace() != s){
s.prepend('\"');
s.append('\"');
} else if(s.isEmpty() && !s.isNull()){
s = "\"\"";
}