fixxx

9 files changed, 24 insertions, 8 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 07ec459..6e60c56 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -450,32 +450,35 @@ void CalendarView::init()
     mDateNavigator = new DateNavigatorContainer( mLeftFrame,
                                                "CalendarView::DateNavigator" );
 #if 0
     // FIXME
     mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE,
                                         "CalendarView::DateNavigator", QDate::currentDate());
 #endif
     // mDateNavigator->blockSignals( true );
     //leftFrameLayout->addWidget( mDateNavigator  );
     mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall");
     mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); 
     mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView");
     connect( mCalEditView, SIGNAL( calendarEnabled (int,bool) ),mCalendar, SLOT( setCalendarEnabled(int,bool)) );
     connect( mCalEditView, SIGNAL( alarmEnabled(int,bool) ),mCalendar, SLOT( setAlarmEnabled(int,bool)) );
     connect( mCalEditView, SIGNAL( calendarReadonly(int,bool) ),mCalendar, SLOT( setReadOnly(int,bool)) );
     connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) );
+    connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) );
+    connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) );
+    connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) );
     mTodoList->setNavigator( mNavigator );
 #if 0
     if (  QApplication::desktop()->width() < 480 ) {
         leftFrameLayout->addWidget(mFilterView);
         leftFrameLayout->addWidget(mTodoList, 2 );
       
     } else {
         leftFrameLayout->addWidget(mTodoList,2 );
         leftFrameLayout->addWidget(mFilterView );
     } 
 #endif
     mFilterView->hide();
     mCalEditView->hide();
     QWidget *rightBox = new QWidget( mMainFrame );
     //mainBoxLayout->addWidget ( rightBox, 10 );
     QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
@@ -1856,32 +1859,37 @@ bool CalendarView::loadCalendars()
     updateUnmanagedViews();
     updateView();
 }
 bool CalendarView::restoreCalendarSettings()
 {
     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     while ( cal ) {
         mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled );
         mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled );
         mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly );
         if ( cal->isStandard )
             mCalendar->setDefaultCalendar( cal->mCalNumber );
         cal = calendars.next();
     }
 }
+void CalendarView::addCalendarId( int id )
+{
+    KopiCalendarFile * cal = KOPrefs::instance()->getCalendar( id );
+    addCalendar( cal );    
+}
 bool CalendarView::addCalendar( KopiCalendarFile * cal )
 {
 
     if ( mCalendar->addCalendarFile( cal->mFileName, cal->mCalNumber ))
         return true;
     qDebug("KO: Error adding calendar file %1 ",cal->mFileName.latin1() );
     KMessageBox::error(this,i18n("Error loading calendar file\n%1.").arg(cal->mFileName));
     return false;
 }
 bool CalendarView::openCalendar(QString filename, bool merge)
 {
 
     if (filename.isEmpty()) {
         return false;
     }
 
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 0144ba4..ec5b7ab 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -214,32 +214,33 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
 
     void insertBirthdays(const QString& uid, const QStringList& birthdayList, 
 			 const QStringList& anniversaryList, const QStringList& realNameList,
 			 const QStringList& emailList, const QStringList& assembledNameList,
 			 const QStringList& uidList);
 
     /**
       Load calendar from file \a filename. If \a merge is true, load 
       calendar into existing one, if it is false, clear calendar, before
       loading. Return true, if calendar could be successfully loaded.
     */
     bool openCalendar(QString filename, bool merge=false);
     bool loadCalendars();
     bool saveCalendars();
     bool restoreCalendarSettings();
     bool addCalendar( KopiCalendarFile * );
+    void addCalendarId( int id );
     bool syncCalendar(QString filename,int mode = 0 );
 
     /**
       Save calendar data to file. Return true if calendar could be
       successfully saved.
     */
     bool saveCalendar(QString filename);
   
     /**
       Close calendar. Clear calendar data and reset views to display an empty
       calendar.
     */
     void closeCalendar();
   
     /** Archive old events of calendar */
     void archiveCalendar();
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 5a3c4d2..c7bc6eb 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -108,33 +108,33 @@ void KOAgendaItem::init ( Incidence *incidence, QDate qd )
    
     if ( (incidence->typeID() == todoID ) &&
          ( !((static_cast<Todo*>(incidence))->isCompleted()) &&
            ((static_cast<Todo*>(incidence))->dtDue().date() <=  QDate::currentDate()) ) ) {
         if (  (static_cast<Todo*>(incidence))->dtDue() <  QDateTime::currentDateTime().date()) 
             mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ;
         else 
             mBackgroundColor = KOPrefs::instance()->mTodoDueTodayColor;
     }
     else {
         QStringList categories = mIncidence->categories();
         QString cat = categories.first();
         if (cat.isEmpty()) {
             if ( (incidence->typeID() == todoID ) &&((static_cast<Todo*>(incidence))->isCompleted()) )
                 mBackgroundColor =KOPrefs::instance()->mTodoDoneColor;
             else
-                mBackgroundColor =KOPrefs::instance()->mEventColor;
+                mBackgroundColor =KOPrefs::instance()->defaultColor( incidence->calID() );
         } else {
             mBackgroundColor = *KOPrefs::instance()->categoryColor(cat);
             if ( (incidence->typeID() == todoID ) &&((static_cast<Todo*>(incidence))->isCompleted()) ) {
                 if ( mBackgroundColor == KOPrefs::instance()->mEventColor )
                     mBackgroundColor =KOPrefs::instance()->mTodoDoneColor;
             }
         }
             
     }
     mColorGroup  = QColorGroup( mBackgroundColor.light(), 
                                 mBackgroundColor.dark(),mBackgroundColor.light(),
                                 mBackgroundColor.dark(),mBackgroundColor, black, mBackgroundColor) ;
     setBackgroundColor( mBackgroundColor );
    
     mConflictItems.clear();
     setCellXY(0,0,1);
@@ -188,33 +188,33 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
     int x = pos().x() +3; 
     int y;
     if ( mAllDay )
         y = pos().y()+3;
     else
         y =  mCellYTop * ( height() / cellHeight() ) +3;
     if (mIncidence->cancelled()) {
         int xpos = xOff*( 1 +AGENDA_ICON_SIZE )+x;
         int ypos = yOff*( 1 +AGENDA_ICON_SIZE)+y;
         p->drawLine( xpos, ypos, xpos+AGENDA_ICON_SIZE-1, ypos+AGENDA_ICON_SIZE-1  );
         p->drawLine( xpos, ypos+AGENDA_ICON_SIZE-1, xpos+AGENDA_ICON_SIZE-1, ypos );
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
-    if (mIncidence->isAlarmEnabled()) {
+    if (mIncidence->isAlarmEnabled() && mIncidence->alarmEnabled()) {
         p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, red );
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
     if (mIncidence->recurrence()->doesRecur()) {
         p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, blue );
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
     if (mIncidence->description().length() > 0) {
         p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkGreen );
         if ( horLayout )
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 29a4393..2b16347 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -145,32 +145,33 @@ void KOFilterView::setSelectedFilter( int fil )
 KOCalEditView::KOCalEditView(QWidget* parent,
                            const char* name )
   : QWidget(parent,name)
 {
     mw = 0;
     ml = new QVBoxLayout ( this );
 }
 
 KOCalEditView::~KOCalEditView()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 void KOCalEditView::selectCal(int id ,bool b)
 {
     KOPrefs::instance()->getCalendar( id )->isEnabled = b;
     emit calendarEnabled ( id, b );
+    emit needsUpdate();
 
 }
 void KOCalEditView::selectStdCal( int id, bool b )
 {
 
     if ( !b ) {
         KOCalCheckButton* it = (KOCalCheckButton*) sender();
         if ( it ) {
             it->blockSignals( true );
             it->setChecked( true );
             it->blockSignals( false );
             return;
         }
         return;
     }
     KOCalCheckButton* sen = (KOCalCheckButton*) sender();
@@ -186,42 +187,45 @@ void KOCalEditView::selectStdCal( int id, bool b )
         }
         it = mStdandardB.next();
     }
    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     while ( kkf ) {
         kkf->isStandard = false;
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     KOPrefs::instance()->getCalendar( id )->isStandard = true;
     emit setCalendarDefault ( id );
 }
 
 void KOCalEditView::selectCalAlarm(int id ,bool b )
 {
     KOPrefs::instance()->getCalendar( id )->isAlarmEnabled = b;
     emit alarmEnabled ( id , b );
+    emit needsUpdate();
 }
 void KOCalEditView::selectReadOnly(int id ,bool b )
 {
     KOPrefs::instance()->getCalendar( id )->isReadOnly = b;
     emit calendarReadonly ( id , b );
+    emit needsUpdate();
     
 }
 void KOCalEditView::setColor( const QColor& c, int id )
 {
     KOPrefs::instance()->getCalendar( id )->mDefaultColor = c;
+    emit needsUpdate();
 }
 void KOCalEditView::deleteCal( int id )
 {
     KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id );
     QString name = kkf->mName;
     QString file = kkf->mFileName;
     if ( KMessageBox::warningContinueCancel( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b><tr> Do you want to remove this calendar from KO/Pi? (The file is not removed, of course!)").arg(name).arg(file) ) != KMessageBox::Continue ) return;
     emit removeCalendar ( id );
     KOPrefs::instance()->mCalendars.remove ( kkf );
     readConfig(); 
 }
 void KOCalEditView::infoCal( int id )
 {
     QString name = KOPrefs::instance()->getCalendar( id )->mName;
     QString file = KOPrefs::instance()->getCalendar( id )->mFileName;
     KMessageBox::information( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) );
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index aaf0eb6..4a0cd8a 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -125,31 +125,32 @@ class KOCalEditView : public QWidget
     void disableRO();
     void deleteAll();
     void selectStdCal(int,bool );
     void selectCal(int,bool );
     void selectCalAlarm(int,bool );
     void selectReadOnly(int,bool );
     void setColor(const QColor &,int) ;
     void deleteCal(int) ;
     void infoCal(int) ;
   signals:
     void alarmEnabled ( int cal, bool enable );
     void calendarEnabled ( int cal, bool enable );
     void calendarReadonly ( int cal, bool readonly );
     void setCalendarDefault ( int cal );
     void removeCalendar ( int cal );
     void calendarAdded( int );
+    void needsUpdate();
 
   private:
     QVBoxLayout* ml;
     QWidget *mw;
     void toggleList ( QPtrList<KOCalCheckButton> );
     QPtrList<KOCalCheckButton> mStdandardB;
     QPtrList<KOCalCheckButton> mEnabledB;
     QPtrList<KOCalCheckButton> mAlarmB;
     QPtrList<KOCalCheckButton> mROB;
     QGridLayout* mainLayout; 
 };
 
 
 
 #endif // KOFILTERVIEW_H
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index c868270..96f2502 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -735,33 +735,33 @@ int MonthViewCell::insertEvent(Event *event)
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         item->setPalette( pal );
         item->setRecur( event->recurrence()->doesRecur() );
-        item->setAlarm( event->isAlarmEnabled() && multiday < 2 );
+        item->setAlarm( event->isAlarmEnabled() && multiday < 2 && event->alarmEnabled() );
         item->setMoreInfo( event->description().length() > 0  );
 #ifdef DESKTOP_VERSION
         Attendee *me = event->attendeeByMails(KOPrefs::instance()->mAdditionalMails,
                                               KOPrefs::instance()->email());
         if ( me != 0 ) {
             if ( me->status() == Attendee::NeedsAction && me->RSVP())
                 item->setReply(true && multiday < 2);
             else
                 item->setReply(false);
         } else
             item->setReply(false);
 #endif
         item->setMultiDay( multiday );
         if ( multiday ) {
             insertItem( item ,mdayCount);
             ++mdayCount;
@@ -816,33 +816,33 @@ void MonthViewCell::insertTodo(Todo *todo)
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         item->setPalette( pal );
         item->setRecur( todo->recurrence()->doesRecur() );
-        item->setAlarm( todo->isAlarmEnabled() );
+        item->setAlarm( todo->isAlarmEnabled() && todo->alarmEnabled() );
         item->setMoreInfo( todo->description().length() > 0  );
         insertItem( item , count());
 #ifdef DESKTOP_VERSION
         mToolTip.append( text ); 
 #endif
 }
 void MonthViewCell::repaintfinishUpdateCell()
 {
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         mitem->setBlockRepaint( false );
         updateItem ( mitem );
         mitem = (MonthViewItem *)mitem->next();
     }
 }
 void MonthViewCell::finishUpdateCell()
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 2602487..35c2a9f 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -691,33 +691,33 @@ void KOTodoView::updateView()
   }
 */
 
   // Put for each Event a KOTodoViewItem in the list view. Don't rely on a
   // specific order of events. That means that we have to generate parent items
   // recursively for proper hierarchical display of Todos.
   mTodoMap.clear();
   Todo *todo;
   todo = todoList.first();// todo; todo = todoList.next()) {
   while ( todo ) {
       bool next = true;
       // qDebug("todo %s ", todo->summary().latin1());
       Incidence *incidence = todo->relatedTo();
       while  ( incidence ) {
           if ( incidence->typeID() == todoID ) {
               //qDebug("related %s ",incidence->summary().latin1() );
-              if ( !(todoList.contains ( ((Todo* )incidence ) ) )) {
+              if ( !(todoList.contains ( ((Todo* )incidence ) ) )  && incidence->calEnabled() ) {
                   //qDebug("related not found ");
                   todoList.remove( );
                   todo = todoList.current();
                   next = false;
                   incidence = 0;
 
               } else {
                   //qDebug("related found  ");
                   incidence = incidence->relatedTo();
               }
           } else 
               incidence = 0;
       }
       if ( next )
           todo = todoList.next();
   }
@@ -831,32 +831,34 @@ void KOTodoView::restoreItemState( QListViewItem *item )
     todoItem->setOpen( mDocPrefs->readBoolEntry( todoItem->todo()->uid() ) );
     if( item->childCount() > 0 ) restoreItemState( item->firstChild() );
     item = item->nextSibling();
   }
 }
 
 
 QMap<Todo *,KOTodoViewItem *>::ConstIterator
   KOTodoView::insertTodoItem(Todo *todo)
 {
 
 //  kdDebug() << "KOTodoView::insertTodoItem(): " << todo->getSummary() << endl;
   // TODO: Check, if dynmaic cast is necessary
 
     pendingSubtodo = 0;
   Incidence *incidence = todo->relatedTo();
+    while ( incidence && !incidence->calEnabled() )
+        incidence = incidence->relatedTo();
   if (incidence && incidence->typeID() == todoID ) {
     Todo *relatedTodo = static_cast<Todo *>(incidence);
 
 //    kdDebug() << "  has Related" << endl;
     QMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator;
     itemIterator = mTodoMap.find(relatedTodo);
     if (itemIterator == mTodoMap.end()) {
 //      kdDebug() << "    related not yet in list" << endl;
       itemIterator = insertTodoItem (relatedTodo);
     }
     // isn't this pretty stupid? We give one Todo  to the KOTodoViewItem
     // and one into the map. Sure finding is more easy but why? -zecke
     KOTodoViewItem *todoItem = new KOTodoViewItem(*itemIterator,todo,this);
     return mTodoMap.insert(todo,todoItem);
   } else {
 //    kdDebug() << "  no Related" << endl;
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 8cb6b83..f987b63 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -182,33 +182,33 @@ void KOTodoViewItem::setMyPixmap()
   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() ) {
+  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;
   }  
   if ( mTodo->doesRecur() ) {
       pixi.resize(size, pixSize+size);
       pPix.fill( Qt::blue );
       p.begin( &pixi );
       p. drawPixmap ( 0, pixSize, pPix);
       p.end();
       pixSize += size;
   } 
   //   }
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index e8574a0..221debc 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -582,33 +582,33 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
                         tempText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>";
 
 
                     } else 
                         tempText +=((Todo*)ev)->dtDueTimeStr();
                 mTodos.append( ev );
             }
         }
     }
     tempText += "</b></td><td>";
     bool needClose = false;
     if ( ev->cancelled() ) {
         tempText += "<font color=\"#F00000\">[c";
         needClose =true;
 
     }
-    if ( ev->isAlarmEnabled() ) { 
+    if ( ev->isAlarmEnabled() && ev->alarmEnabled()) { 
         if ( !needClose)
             tempText +="[";
         tempText += "a";
         needClose =true;
 
     }
     if ( ev->description().length() > 0 ) {
         if ( !needClose)
             tempText +="[";
         tempText += "i";
         needClose =true;
     }
     if ( ev->recurrence()->doesRecur() ) {
         if ( !needClose)
             tempText +="[";
         tempText += "r";
@@ -656,33 +656,33 @@ bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub )
 
     mTodos.append( ev );
     if ( !isSub )
         mText += "<p>";
     else
         mText += "<li>";
     mText += "[" +QString::number(ev->priority()) + "/" + QString::number(((Todo*)ev)->percentComplete())+"%] ";
 
 
     mText += ind;
     bool needClose = false;
     if ( ev->cancelled() ) {
         mText += "<font color=\"#F00000\">[c";
         needClose =true;
 
     }
-    if ( ev->isAlarmEnabled() ) { 
+    if ( ev->isAlarmEnabled() && ev->alarmEnabled() ) { 
         if ( !needClose)
             mText +="[";
         mText += "a";
         needClose =true;
 
     }
    
     if ( ev->description().length() > 0 ) {
         if ( !needClose)
             mText +="[";
         mText += "i";
         needClose =true;
     }  
     if ( ev->doesRecur() ) {
         if ( !needClose)
             mText +="[";