fixxx

2 files changed, 6 insertions, 10 deletions

diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 35c2a9f..b2ff33b 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -383,115 +383,110 @@ void KOQuickTodo::focusInEvent(QFocusEvent *ev)
 void KOQuickTodo::focusOutEvent(QFocusEvent *ev)
 {
   setText(i18n("Click to add a new Todo"));
   QLineEdit::focusOutEvent(ev);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   KOrg::BaseView(calendar,parent,name)
 {
     mPendingUpdateBeforeRepaint = false;
     isFlatDisplay = false;
   mNavigator = 0;
   QBoxLayout *topLayout = new QVBoxLayout(this);
   mName = QString ( name );
   mBlockUpdate = false;
   mQuickAdd = new KOQuickTodo(this);
   topLayout->addWidget(mQuickAdd);
 
   if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickAdd->hide();
 
   mTodoListView = new KOTodoListView(calendar,this, name );
   topLayout->addWidget(mTodoListView);
   //mTodoListView->header()->setMaximumHeight(30);
   mTodoListView->setRootIsDecorated(true);
   mTodoListView->setAllColumnsShowFocus(true);
 
   mTodoListView->setShowSortIndicator(true);
 
   mTodoListView->addColumn(i18n("Todo"));
   mTodoListView->addColumn(i18n("Prio"));
   mTodoListView->setColumnAlignment(1,AlignHCenter);
   mTodoListView->addColumn(i18n("Complete"));
   mTodoListView->setColumnAlignment(2,AlignCenter);
 
   mTodoListView->addColumn(i18n("Due Date"));
   mTodoListView->setColumnAlignment(3,AlignLeft);
   mTodoListView->addColumn(i18n("Due Time"));
   mTodoListView->setColumnAlignment(4,AlignHCenter);
 
   mTodoListView->addColumn(i18n("Start Date"));
   mTodoListView->setColumnAlignment(5,AlignLeft);
   mTodoListView->addColumn(i18n("Start Time"));
   mTodoListView->setColumnAlignment(6,AlignHCenter);
 
   mTodoListView->addColumn(i18n("Cancelled"));
   mTodoListView->addColumn(i18n("Categories"));
+  mTodoListView->addColumn(i18n("Calendar"));
 #if 0
   mTodoListView->addColumn(i18n("Sort Id"));
   mTodoListView->setColumnAlignment(4,AlignHCenter);
 #endif
 
   mTodoListView->setMinimumHeight( 60 );
   mTodoListView->setItemsRenameable( true );
   mTodoListView->setRenameable( 0 );
   mTodoListView->setColumnWidth( 0, 120 );
-  mTodoListView->setColumnWidthMode(0, QListView::Manual);
-  mTodoListView->setColumnWidthMode(1, QListView::Manual);
-  mTodoListView->setColumnWidthMode(2, QListView::Manual);
-  mTodoListView->setColumnWidthMode(3, QListView::Manual);
-  mTodoListView->setColumnWidthMode(4, QListView::Manual);
-  mTodoListView->setColumnWidthMode(5, QListView::Manual);
-  mTodoListView->setColumnWidthMode(6, QListView::Manual);
-  mTodoListView->setColumnWidthMode(7, QListView::Manual);
-  mTodoListView->setColumnWidthMode(8, QListView::Manual);
- 
+  int iii = 0;
+  for ( iii = 0; iii< 10 ; ++iii )
+      mTodoListView->setColumnWidthMode( iii, QListView::Manual );
+
 
   mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this);
 
   mPriorityPopupMenu = new QPopupMenu(this);
   for (int i = 1; i <= 5; i++) {
     QString label = QString ("%1").arg (i);
     mPriority[mPriorityPopupMenu->insertItem (label)] = i;
   }
   connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int)));
 
   mPercentageCompletedPopupMenu = new QPopupMenu(this);
   for (int i = 0; i <= 100; i+=20) {
     QString label = QString ("%1 %").arg (i);
     mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i;
   }
   connect (mPercentageCompletedPopupMenu, SIGNAL (activated (int)), SLOT (setNewPercentage (int)));
 
 
   
   mItemPopupMenu = new QPopupMenu(this); 
   mItemPopupMenu->insertItem(i18n("Show..."), this,
                              SLOT (showTodo()));
   mItemPopupMenu->insertItem(i18n("Edit..."), this,
                              SLOT (editTodo()));
   mItemPopupMenu->insertItem( i18n("Delete"), this,
                              SLOT (deleteTodo()));
   mItemPopupMenu->insertItem( i18n("Clone..."), this,
                              SLOT (cloneTodo()));
   mItemPopupMenu->insertItem( i18n("Move..."), this,
                              SLOT (moveTodo()));
 #ifndef DESKTOP_VERSION
   mItemPopupMenu->insertItem( i18n("Beam..."), this,
                              SLOT (beamTodo()));
 #endif
   mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this,
                              SLOT (cancelTodo()));
   mItemPopupMenu->insertSeparator();
   mItemPopupMenu->insertItem( i18n("Start/Stop todo..."), this,
                              SLOT (toggleRunningItem()));
   mItemPopupMenu->insertSeparator();
   /*
   mItemPopupMenu->insertItem( i18n("New Todo..."), this,
                              SLOT (newTodo()));
   */
   mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this,
                              SLOT (newSubTodo())); 
   mItemPopupMenu->insertItem(i18n("Unparent Todo"), this,
                              SLOT (unparentTodo()),0,21);
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 748f3e4..f62aab8 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -110,96 +110,97 @@ void KOTodoViewItem::construct()
       //setSortKey(4,keyt);
     }
   } else {
     setText(3,"");
     setText(4,"");
   }
   setSortKey(3,keyd);
   setSortKey(4,keyt);
 
   if (mTodo->isCompleted()) setSortKey(1,"6" + QString::number(mTodo->priority())+keyd+keyt);
   else setSortKey(1,QString::number(mTodo->priority())+keyd+keyt);
 
 
 
   keyd = "";
   keyt = "";
 
   if (mTodo->isRunning() ) {
       QDate d = mTodo->runStart().date();
       QTime t = mTodo->runStart().time();
       skeyt.sprintf("%02d%02d",t.hour(),t.minute());
       skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
       keyd = KGlobal::locale()->formatDate( d , true);
       keyt = KGlobal::locale()->formatTime( t );
 
   } else {
 
       if (mTodo->hasStartDate()) {
           keyd = mTodo->dtStartDateStr();
           QDate d = mTodo->dtStart().date();
           skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
     
           if ( !mTodo->doesFloat()) {
               keyt = mTodo->dtStartTimeStr();
               QTime t = mTodo->dtStart().time();
               skeyt.sprintf("%02d%02d",t.hour(),t.minute());
       
           }
       
       }
   }
   setText(5,keyd);
   setText(6,keyt);
   setSortKey(5,skeyd);
   setSortKey(6,skeyt);
 
   setText(7,mTodo->cancelled() ? i18n("Yes") : i18n("No"));
   setText(8,mTodo->categoriesStr());
+  setText(9,KOPrefs::instance()->calName( mTodo->calID()));
 
 #if 0
   // Find sort id in description. It's the text behind the last '#' character
   // found in the description. White spaces are removed from beginning and end
   // of sort id.
   int pos = mTodo->description().findRev('#');
   if (pos < 0) {
     setText(6,"");
   } else {
     QString str = mTodo->description().mid(pos+1);
     str.stripWhiteSpace();
     setText(6,str);
   }
 #endif
 
   m_known = false;
   m_init = false; 
 
   setMyPixmap();
 
 }
 void KOTodoViewItem::setMyPixmap()
 {
   int size = 5;
   QPixmap pixi =  QPixmap( 1, 1 );
   // if ( !mTodo->isCompleted() &&  mTodo->hasDueDate() && mTodo->dtDue() < QDateTime::currentDateTime() ) {
 //       pixi = SmallIcon("redcross16"); 
 //   } else {
       QPainter p;
  
   int pixSize = 0;
   QPixmap pPix =  QPixmap(  size, size );
   if ( mTodo->description().length() > 0 ) {
       pixi.resize(size, pixSize+size);
       pPix.fill( Qt::darkGreen );
       p.begin( &pixi );
       p. drawPixmap ( 0, pixSize, pPix);
       p.end();
       pixSize += size;
   } 
   if ( mTodo->isAlarmEnabled() && mTodo->alarmEnabled()) {
       pixi.resize(size, pixSize+size);
       pPix.fill( Qt::red );
       p.begin( &pixi );
       p. drawPixmap ( 0, pixSize, pPix);
       p.end();
       pixSize += size;
   }