1 files changed, 9 insertions, 2 deletions

diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp
index 52a3087..779b28c 100644
--- a/core/pim/todo/todotable.cpp
+++ b/core/pim/todo/todotable.cpp
@@ -551,88 +551,92 @@ void TodoTable::slotCheckPriority(int row, int col )
 
 void TodoTable::updateJournal( const ToDoEvent &todo, journal_action action )
 {
     QFile f( journalFileName() );
     if ( !f.open(IO_WriteOnly|IO_Append) )
 	return;
     QString buf;
     QCString str;
     buf = "<Task";
     //    todo.save( buf );
     buf += " Action=\"" + QString::number( int(action) ) + "\"";
     buf += " Uid=\"" + QString::number( todo.uid() ) + "\""; // better write the id
     buf += " Completed=\""+ QString::number((int)todo.isCompleted() ) + "\"";
     buf += " HasDate=\""+ QString::number((int)todo.hasDate() ) +"\"";
     buf += " Priority=\"" + QString::number( todo.priority() ) + "\"";
     QArray<int> arrat = todo.categories();
     QString attr;
     for(uint i=0; i < arrat.count(); i++ ){
       attr.append(QString::number(arrat[i])+";" );
     }
     if(!attr.isEmpty() ) // remove the last ;
       attr.remove(attr.length()-1, 1 );
     buf += " Categories=\"" + attr + "\"";
     buf += " Description=\"" + todo.description() + "\"";
+    buf += " Summary=\"" + todo.summary() + "\"";
     if(todo.hasDate() ) {
       buf += " DateYear=\""+QString::number( todo.date().year() ) + "\"";
       buf += " DateMonth=\"" + QString::number( todo.date().month() ) + "\"";
       buf += " DateDay=\"" + QString::number( todo.date().day() ) + "\"";
     }
     buf += "/>\n";
     str = buf.utf8();
     f.writeBlock( str.data(), str.length() );
     f.close();
 }
 
 void TodoTable::rowHeightChanged( int row )
 {
     if ( enablePainting )
 	QTable::rowHeightChanged( row );
 }
 
 void TodoTable::loadFile( const QString &/*we use the standard*/ )
 {
 
   QList<ToDoEvent> list;
   ToDoDB todoDB;
   QValueList<ToDoEvent> vaList = todoDB.rawToDos();
   for(QValueList<ToDoEvent>::ConstIterator it = vaList.begin(); it != vaList.end(); ++it ){
     ToDoEvent *event = new ToDoEvent( (*it) );
     list.append( event );
   }   
   vaList.clear();
   //     qDebug("parsing done=%d", t.elapsed() );
   if ( list.count() > 0 ) {
     internalAddEntries( list );
     list.clear();
   }
 //     qDebug("loading done: t=%d", t.elapsed() );
 }
 
 void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row )
 {
-    QString strTodo;
-    strTodo = todo.description().left(40).simplifyWhiteSpace();
+    QString strTodo = todo.summary();
+    if( strTodo.isEmpty() ){
+        strTodo = todo.description().left(40).simplifyWhiteSpace();
+	//todo.setSummary(strTodo );
+    }
     if ( row == -1 ) {
 	QMapIterator<CheckItem*, ToDoEvent *> it;
 	for ( it = todoList.begin(); it != todoList.end(); ++it ) {
 	    if ( *(*it) == todo ) {
 		row = it.key()->row();
 		it.key()->setChecked( todo.isCompleted() );
 		static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) );
 		item( row, 2 )->setText( strTodo );
 
 		if (showDeadl){
 		  static_cast<DueTextItem*>(item(row,3))->setToDoEvent(&todo );
 		}
 
 		*(*it) = todo;
 	    }
 	}
     } else {
 	ToDoEvent *t = todoList[static_cast<CheckItem*>(item(row, 0))];
 	todoList.remove( static_cast<CheckItem*>(item(row, 0)) );
 	delete t;
 	static_cast<CheckItem*>(item(row, 0))->setChecked( todo.isCompleted() );
 	static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) );
 	item( row, 2 )->setText( strTodo );
 
@@ -887,48 +891,51 @@ static ToDoEvent xmlToEvent( XMLElement *element )
     int year, day, month = 0;
     year = day = month;
     // year
     dummy = element->attribute("DateYear" );
     dumInt = dummy.toInt(&ok );
     if( ok ) year = dumInt;
     // month
     dummy = element->attribute("DateMonth" );
     dumInt = dummy.toInt(&ok );
     if(ok ) month = dumInt;
     dummy = element->attribute("DateDay" );
     dumInt = dummy.toInt(&ok );
     if(ok ) day = dumInt;
     // set the date
     QDate date( year, month, day );
     event.setDate( date);
   }
   dummy = element->attribute("Priority" );
   dumInt = dummy.toInt(&ok );
   if(!ok ) dumInt = ToDoEvent::NORMAL;
   event.setPriority( dumInt );
   //description
   dummy = element->attribute("Description" );
   event.setDescription( dummy );
+  // summary
+  dummy = element->attribute("Summary" );
+  event.setSummary( dummy );
   // category
   dummy = element->attribute("Categories" );
   QStringList ids = QStringList::split(";", dummy );
   event.setCategories( ids );     
   
   //uid
   dummy = element->attribute("Uid" );
   dumInt = dummy.toInt(&ok );
   if(ok ) event.setUid( dumInt );
   return event;
 }
 
 }
 // int TodoTable::rowHeight( int ) const
 // {
 //     return 18;
 // }
 
 // int TodoTable::rowPos( int row ) const
 // {
 //     return 18*row;
 // }
 
 // int TodoTable::rowAt( int pos ) const