fff

2 files changed, 11 insertions, 7 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 02d2585..da81586 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -888,77 +888,84 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
                      SIGNAL( newEventSignal( QDateTime ) ) );
             connect( cell, SIGNAL( showDaySignal( QDate ) ),
                      SIGNAL( showDaySignal( QDate ) ) );
         }
     }
     mCellsW.resize( mDaysPerWeek );
     for( col = 0; col < mDaysPerWeek; ++col ) {
         MonthViewCell *cell = new MonthViewCell( this, mWeekView );
         mCellsW.insert( col, cell );
 
         connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                  SLOT( defaultAction( Incidence * ) ) );
         connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                  SIGNAL( newEventSignal( QDateTime ) ) );
         connect( cell, SIGNAL( showDaySignal( QDate ) ),
                  SIGNAL( showDaySignal( QDate ) ) );
         cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
     }
 
     //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
     mContextMenu = eventPopup();
     // updateConfig(); //useless here...
     // ... but we need mWidthLongDayLabel computed
     QFontMetrics fontmetric(mDayLabels[0]->font());
     mWidthLongDayLabel = 0;
     for (int i = 0; i < 7; i++) {
         int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
         if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
     }
 
     //mWeekLabels[mNumWeeks]->setText( i18n("W"));
 
+#if 0
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
+#endif
 
     emit incidenceSelected( 0 );
 #ifndef DESKTOP_VERSION
     resize( QApplication::desktop()->size() );
 #else
     resize(640, 480 );
+    updatePossible = true;
 #endif
     computeLayout();
 
+    if ( mShowWeekView )
+        mWidStack->raiseWidget( mWeekView );
+    else
+        mWidStack->raiseWidget( mMonthView );
 }
 
 KOMonthView::~KOMonthView()
 {
     delete mContextMenu;
 }
 
 void KOMonthView::selectInternalWeekNum ( int n )
 {
     switchView();
     emit selectWeekNum ( n );
 }
 
 int KOMonthView::currentWeek()
 {
     if ( mShowWeekView )
         return mWeekLabelsW[0]->getWeekNum();
     return mWeekLabels[0]->getWeekNum();
 }
 void KOMonthView::switchView()
 {
 
     if ( selectedCell( ) )
         selectedCell()->deselect();
     mShowWeekView = !mShowWeekView;
     KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
     if ( clPending ) {
       computeLayout();
       updateConfig();
     }
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 78d4027..44db209 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -237,175 +237,172 @@ void KOTodoViewItem::stateChange(bool state)
   else setSortKey(1,QString::number(mTodo->priority())+keyd+keyt);
   
   setText(2,i18n("%1 %").arg(QString::number(mTodo->percentComplete())));
   if (mTodo->percentComplete()<100) {
     if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
     else setSortKey(2,QString::number(mTodo->percentComplete()));
   }
   else {
     if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
     else setSortKey(2,QString::number(99));
   }
   if ( state ) {
       QListViewItem * myChild = firstChild();
       KOTodoViewItem *item;
       while( myChild ) {
           //qDebug("stateCH ");
           item = static_cast<KOTodoViewItem*>(myChild);
           item->stateChange(state);
           myChild = myChild->nextSibling();
       }
   } else {
       QListViewItem * myChild = parent();
       if ( myChild )
           (static_cast<KOTodoViewItem*>(myChild))->stateChange(state);
   }
   mTodoView->modified(true);
   setMyPixmap();
   mTodoView->setTodoModified( mTodo );
 }
 
 bool KOTodoViewItem::isAlternate()
 {
-#ifndef KORG_NOLVALTERNATION
+
   KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
   if (lv && lv->alternateBackground().isValid())
   {
     KOTodoViewItem *above = 0;
     above = dynamic_cast<KOTodoViewItem *>(itemAbove());
     m_known = above ? above->m_known : true;
     if (m_known)
     {
        m_odd = above ? !above->m_odd : false;
     }
     else
     {
        KOTodoViewItem *item;
        bool previous = true;
        if (QListViewItem::parent())
        {
           item = dynamic_cast<KOTodoViewItem *>(QListViewItem::parent());
           if (item)
              previous = item->m_odd;
           item = dynamic_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild());
        }
        else
        {
           item = dynamic_cast<KOTodoViewItem *>(lv->firstChild());
        }
 
        while(item)
        {
           item->m_odd = previous = !previous;
           item->m_known = true;
           item = dynamic_cast<KOTodoViewItem *>(item->nextSibling());
        }
     }
     return m_odd;
   }
   return false;
-#else
-  return false;
-#endif
 }
 
 void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
 {
   QColorGroup _cg = cg;
   QColorGroup::ColorRole role; 
   if ( KOPrefs::instance()->mTodoViewUsesForegroundColor )
       role = QColorGroup::Text;
   else
       role = QColorGroup::Base;
   //#ifndef KORG_NOLVALTERNATION
-  // if (isAlternate())
-  //    _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground());
+  if (isAlternate())
+      _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground());
   bool setColor = KOPrefs::instance()->mTodoViewUsesCatColors;
   QColor colorToSet;
    if ( setColor ) {
       QStringList categories = mTodo->categories();
       QString cat = categories.first();
       if ( !cat.isEmpty()) {
           colorToSet = *(KOPrefs::instance()->categoryColor(cat) );
       } else
           setColor = false;  
    }
 
    int odue = mTodo->hasDueSubTodo( !isOpen());
    if (odue == 2) {
        colorToSet = KOPrefs::instance()->mTodoOverdueColor;
        setColor = true;
    } else if ( odue == 1 ) {
        colorToSet = KOPrefs::instance()->mTodoDueTodayColor;     
        setColor = true;
    }
  
 
   if ( setColor ) {
       _cg.setColor(role,colorToSet );
       if ( role == QColorGroup::Base) {
           int rgb = colorToSet.red();
           rgb += colorToSet.blue()/2;
           rgb += colorToSet.green();
           if ( rgb < 200 )
               _cg.setColor(QColorGroup::Text,Qt::white );
       }
   }
   //#endif
   if ( column > 0 ){
       if ( column == 2 && !KOPrefs::instance()->mTodoViewShowsPercentage ) {
           p->save();
           int progress = (int)(( (width-6)*mTodo->percentComplete())/100.0 + 0.5);
           
           p->fillRect( 0, 0, width, height(), _cg.base() ); // background
           // p->setPen(Qt::black );  //border
           // p->setBrush( KOPrefs::instance()->mHighlightColorKGlobalSettings::baseColor() );  //filling
           QColor fc = KOPrefs::instance()->mHighlightColor;
           if ( mTodo->percentComplete() == 100 )
               fc = darkGreen;
           p->drawRect( 2, 2, width-4, height()-4);
           p->fillRect( 3, 3, progress, height()-6, 
                        fc );
           p->restore();
       } else {
           QCheckListItem::paintCell(p, _cg, column, width, alignment);
       }
       return;
   }
 
   int align = alignment;
    
     if ( !p )
 	return;
-
+    
     p->fillRect( 0, 0, width, height(), _cg.brush( QColorGroup::Base ) );
 
     QListView *lv = listView();
     if ( !lv )
 	return;
     int marg = 2;//lv->itemMargin();
     int r = 0;
     QCheckListItem::Type myType = QCheckListItem::CheckBox;
     int BoxSize = 20;
     int boxOffset = 2;
     int xOffset = 2;
     if (qApp->desktop()->width() < 300 ) {
          BoxSize = 14;
          boxOffset = -1;
          xOffset = 1;
          // marg = 0;
     }
     if ( height() < BoxSize ) {
         boxOffset = boxOffset - ((BoxSize -  height())/2) ;
         // qDebug("boxOffset %d  height %d", boxOffset, height() );
         BoxSize = height();
 
     }
     //bool winStyle = lv->style() == WindowsStyle;
 
     int lineStart = 5;
     if ( myType == Controller ) {
         if ( !pixmap( 0 ) )
             r += BoxSize + 4;
     } else {
         ASSERT( lv ); //###
         //	QFontMetrics fm( lv->font() );