2 files changed, 26 insertions, 2 deletions

diff --git a/libopie/pim/oevent.cpp b/libopie/pim/oevent.cpp
index 28cf873..b731c8a 100644
--- a/libopie/pim/oevent.cpp
+++ b/libopie/pim/oevent.cpp
@@ -229,49 +229,61 @@ QString OEvent::toRichText()const {
     if ( !description().isEmpty() ) {
         text += "<b>" + QObject::tr( "Description:") + "</b><br>";
         text += Qtopia::escapeString(description() ).
                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     if ( startDateTime().isValid() ) {
         text += "<b>" + QObject::tr( "Start:") + "</b> ";
         text += Qtopia::escapeString(startDateTime().toString() ).
                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     if ( endDateTime().isValid() ) {
         text += "<b>" + QObject::tr( "End:") + "</b> ";
         text += Qtopia::escapeString(endDateTime().toString() ).
                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     if ( !note().isEmpty() ) {
         text += "<b>" + QObject::tr( "Note:") + "</b><br>";
         text += note();
 //         text += Qtopia::escapeString(note() ).
 //                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     return text;
 }
 QString OEvent::toShortText()const {
-    return description();
+    QString text;
+    text += QString::number( startDateTime().date().day() );
+    text += ".";
+    text += QString::number( startDateTime().date().month() );
+    text += ".";
+    text += QString::number( startDateTime().date().year() );
+    text += " ";
+    text += QString::number( startDateTime().time().hour() );
+    text += ":";
+    text += QString::number( startDateTime().time().minute() );
+    text += " - ";
+    text += description();
+    return text;
 }
 QString OEvent::type()const {
     return QString::fromLatin1("OEvent");
 }
 QString OEvent::recordField( int /*id */ )const {
     return QString::null;
 }
 int OEvent::rtti() {
     return OPimResolver::DateBook;
 }
 bool OEvent::loadFromStream( QDataStream& ) {
     return true;
 }
 bool OEvent::saveToStream( QDataStream& )const {
     return true;
 }
 void OEvent::changeOrModify() {
     if ( data->count != 1 ) {
         data->deref();
         Data* d2 = new Data;
         d2->description = data->description;
         d2->location = data->location;
 
         if (data->manager )
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp
index 28cf873..b731c8a 100644
--- a/libopie2/opiepim/oevent.cpp
+++ b/libopie2/opiepim/oevent.cpp
@@ -229,49 +229,61 @@ QString OEvent::toRichText()const {
     if ( !description().isEmpty() ) {
         text += "<b>" + QObject::tr( "Description:") + "</b><br>";
         text += Qtopia::escapeString(description() ).
                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     if ( startDateTime().isValid() ) {
         text += "<b>" + QObject::tr( "Start:") + "</b> ";
         text += Qtopia::escapeString(startDateTime().toString() ).
                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     if ( endDateTime().isValid() ) {
         text += "<b>" + QObject::tr( "End:") + "</b> ";
         text += Qtopia::escapeString(endDateTime().toString() ).
                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     if ( !note().isEmpty() ) {
         text += "<b>" + QObject::tr( "Note:") + "</b><br>";
         text += note();
 //         text += Qtopia::escapeString(note() ).
 //                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     return text;
 }
 QString OEvent::toShortText()const {
-    return description();
+    QString text;
+    text += QString::number( startDateTime().date().day() );
+    text += ".";
+    text += QString::number( startDateTime().date().month() );
+    text += ".";
+    text += QString::number( startDateTime().date().year() );
+    text += " ";
+    text += QString::number( startDateTime().time().hour() );
+    text += ":";
+    text += QString::number( startDateTime().time().minute() );
+    text += " - ";
+    text += description();
+    return text;
 }
 QString OEvent::type()const {
     return QString::fromLatin1("OEvent");
 }
 QString OEvent::recordField( int /*id */ )const {
     return QString::null;
 }
 int OEvent::rtti() {
     return OPimResolver::DateBook;
 }
 bool OEvent::loadFromStream( QDataStream& ) {
     return true;
 }
 bool OEvent::saveToStream( QDataStream& )const {
     return true;
 }
 void OEvent::changeOrModify() {
     if ( data->count != 1 ) {
         data->deref();
         Data* d2 = new Data;
         d2->description = data->description;
         d2->location = data->location;
 
         if (data->manager )