fixx

2 files changed, 26 insertions, 26 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 64b0e95..1c2d6a2 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -129,33 +129,33 @@ void KNoScrollListBox::focusInEvent ( QFocusEvent * e )
             } else {
                 setVScrollBarMode(QScrollView::Auto);
                 setHScrollBarMode(QScrollView::Auto);
             }
         } 
     }
 }
 void KNoScrollListBox::focusOutEvent ( QFocusEvent * e )
 {
     int i =  currentItem ();
     if ( i >= 0 ) {
         setSelected ( i, false ); 
     }
     QListBox::focusOutEvent ( e ); 
     setVScrollBarMode(QScrollView::AlwaysOff);
     setHScrollBarMode(QScrollView::AlwaysOff);
-    emit highligtIncidence( 0, (MonthViewCell*)this, 0 );
+    emit highlightIncidence( 0, (MonthViewCell*)this, 0 );
 }
 
 QString KNoScrollListBox::getWhatsThisText(QPoint p) 
 {
     QListBoxItem* item = itemAt ( p );
     if ( ! item ) {
         return i18n("Click in the cell\nto add an event!");
     }
     return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence(),
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
 }
 void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
 {
     //qDebug("KNoScrollListBox::keyPressEvent ");
@@ -274,83 +274,83 @@ void KNoScrollListBox::mousePressEvent(QMouseEvent *e)
     QListBox::mousePressEvent(e);
 
     if(e->button() == RightButton) {
         emit rightClick();
     }
 }
 
 MonthViewItem::MonthViewItem( Incidence *incidence, const QString & s)
     : QListBoxItem()
 {
     mblockRepaint = true;
     isWeekItem = KOPrefs::instance()->mMonthViewWeek;
     recycle( incidence, s );
 }
 void MonthViewItem::recycle( Incidence *incidence,  const QString & s)
 { 
-    mDisplayHightlighted = false;
+    mDisplayHighlighted = false;
     setText( s );
     mMultiday = 0; 
     mIncidence = incidence;
     mRecur = false;
     mAlarm = false;
     mReply = false;
     mInfo = false; 
     mdayPos = 0;
 }
 
 bool MonthViewItem::setHighlightedFalse()
 {
-    if ( !mDisplayHightlighted )
+    if ( !mDisplayHighlighted )
         return false;
-    mDisplayHightlighted = false;
+    mDisplayHighlighted = false;
     return true;
 }
 
 bool MonthViewItem::setHighlighted( Incidence * inc )
 {
     if ( inc == mIncidence ) {
-        if ( mDisplayHightlighted )
+        if ( mDisplayHighlighted )
             return false;
-        mDisplayHightlighted = true;
+        mDisplayHighlighted = true;
         return true;
     } else {
-        if ( !mDisplayHightlighted )
+        if ( !mDisplayHighlighted )
             return false;
-        mDisplayHightlighted = false;
+        mDisplayHighlighted = false;
         return true;
     }
     return false;
 }
 void MonthViewItem::paint(QPainter *p)
 {
     if ( mblockRepaint || !mIncidence ) {
         return;
     }
 #if QT_VERSION >= 0x030000
     bool sel = isSelected();
 #else
     bool sel = selected();
 #endif 
     int heihei = height( listBox () );
     int x = 1;
-    if (KOPrefs::instance()->mMonthViewUsesCategoryColor || mDisplayHightlighted || sel )
+    if (KOPrefs::instance()->mMonthViewUsesCategoryColor || mDisplayHighlighted || sel )
         {
            
             p->setBackgroundColor( palette().color( QPalette::Normal,  \
-                                                    sel ||mDisplayHightlighted  ? QColorGroup::Highlight : QColorGroup::Background ) );
+                                                    sel ||mDisplayHighlighted  ? QColorGroup::Highlight : QColorGroup::Background ) );
             p->eraseRect( 0, 0, listBox()->maxItemWidth(), heihei );
         }
    
     //int y = 3;//(height() - mRecurPixmap.height()) /2; 
     int size = PIXMAP_SIZE;
     if ( QApplication::desktop()->width() < 300 )
         size = 3;
     int y = (heihei - size -1 ) /2; 
 
     if ( mIncidence->calID() > 1 ) {
         p->fillRect ( x, y-2,size,size+4, KOPrefs::instance()->defaultColor( mIncidence->calID() ) );
         p->drawRect ( x, y-2,size,size+4);
         x += size + 1;
     }
     if ( KOPrefs::instance()->mMonthShowIcons ) {
         if ( mInfo ) { 
@@ -1087,51 +1087,51 @@ void MonthViewCell::cellClicked( QListBoxItem *item )
 
 void MonthViewCell::contextMenu( QListBoxItem *item )
 {
     mMonthView->setPopupCell( this );
     if ( !item )  {
         mMonthView->showContextMenu( 0 );
         return;
     }
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
     if ( incidence ) mMonthView->showContextMenu( incidence );
 }
 
 void MonthViewCell::selection( QListBoxItem *item )
 {
     if ( !item ) {
-        emit highligtIncidence( 0 , this, 0 );
+        emit highlightIncidence( 0 , this, 0 );
         return;
     }
     MonthViewItem * it = (static_cast<MonthViewItem *>( item ));
-    emit highligtIncidence( it->incidence(), this, it->multiDay() );
+    emit highlightIncidence( it->incidence(), this, it->multiDay() );
     mMonthView->setSelectedCell( this );
 }
 
-void  MonthViewCell::deHightLight()
+void  MonthViewCell::deHighLight()
 {
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         if ( mitem->setHighlightedFalse() )
             updateItem ( mitem );
         mitem = (MonthViewItem *)mitem->next();
     }
 }
 // returns true if no inc found
-bool MonthViewCell::doHightLight( Incidence * inc )
+bool MonthViewCell::doHighLight( Incidence * inc )
 {
  
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         if ( mitem->incidence() == inc ) {
             if ( mitem->setHighlighted( inc ) )
                 updateItem ( mitem );
             return false;
         }
         mitem = (MonthViewItem *)mitem->next();
     }
     return true;
 }    
 // *******************************************************************************
 // *******************************************************************************
 // *******************************************************************************
@@ -1230,52 +1230,52 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     mCells.resize( mNumCells );
     for( row = 0; row < mNumWeeks; ++row ) {
         for( col = 0; col < mDaysPerWeek; ++col ) {
             MonthViewCell *cell = new MonthViewCell( this, mMonthView );
             mCells.insert( row * mDaysPerWeek + 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 ) ) );
             connect( cell, SIGNAL( nextCell() ),
                      SLOT( nextCell() ) );
             connect( cell, SIGNAL( prevCell() ),
                      SLOT( prevCell() ) );
-            connect( cell, SIGNAL(  highligtIncidence( Incidence * , MonthViewCell *, int ) ),
+            connect( cell, SIGNAL(  highlightIncidence( Incidence * , MonthViewCell *, int ) ),
                      SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) ));
         }
     }
     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 ) ) );
         connect( cell, SIGNAL( nextCell() ),
                  SLOT( nextCell() ) );
         connect( cell, SIGNAL( prevCell() ),
                  SLOT( prevCell() ) );
-        connect( cell, SIGNAL(  highligtIncidence( Incidence * , MonthViewCell *, int ) ),
+        connect( cell, SIGNAL(  highlightIncidence( Incidence * , MonthViewCell *, int ) ),
                  SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) ));
         cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
     }
 
     //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
     mContextMenu = eventPopup();
     mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("New Event..."),this,
                                   SLOT(slotNewEvent()),false);
     mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("New Todo..."),this,
                                   SLOT(slotNewTodo()),false);
     mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Journal"),this,
                                   SLOT(slotEditJournal()),false);
 
@@ -1324,77 +1324,77 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
 #endif
     computeLayout();
 
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
 }
 
 KOMonthView::~KOMonthView()
 {
     delete mContextMenu;
 }
 
 void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int mday )
 {
-    //qDebug("KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday );
+    qDebug("11 KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday );
     static Incidence * lastInc = 0;
     static MonthViewCell * lastCell = 0;
     
     if ( lastInc == inc && lastCell == mc )
         return;
     lastInc = inc;
     lastCell = mc;
-    //qDebug("KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday );
+    qDebug("222 KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday );
 
     bool weekview = false;
     int index = 0;
     for (uint i = 0; i < mCellsW.count(); ++i) {
         if ( mCellsW[i] == mc ) {
             weekview = true;
             index = i;
             break;
         }
     }
     QPtrVector<MonthViewCell> *cells;
     if ( weekview ) 
-     cells = &mCellsW;
+        cells = &mCellsW;
     else {
         for (uint i = 0; i < mCells.count(); ++i) {
             if ( mCells[i] == mc ) {
                 index = i;
                 break;
             }
         }
         cells = &mCells;
     }
     for (uint i = 0; i < (*cells).count(); ++i) {
-        (*cells)[i]->deHightLight();
+      (*cells)[i]->deHighLight();
     }
     if ( ! inc ) 
         return;
     if ( mday > 1 && index > 0 )
         for (int i = index-1; i >= 0; --i) {
             //qDebug("index %d iii %d ", index, i);
-            if ( (*cells)[(uint)i]->doHightLight(inc) )
+            if ( (*cells)[(uint)i]->doHighLight(inc) )
                 break;
         }
     if ( mday < 3 && mday > 0 && index < (*cells).count()-1)
         for (uint i = index+1; i < (*cells).count(); ++i) {
-            if ( (*cells)[i]->doHightLight(inc) )
+            if ( (*cells)[i]->doHighLight(inc) )
                 break;
         }
     
 }
 void KOMonthView::selectInternalWeekNum ( int n )
 {
     switchView();  
     if ( !KOPrefs::instance()->mMonthViewWeek )
         emit selectMonth ();
     else
         emit selectWeekNum ( n );
 }
 
 int KOMonthView::currentWeek()
 {
     if ( mShowWeekView )
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 2622d10..0f3aa54 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -73,33 +73,33 @@ private slots :
 };
 
 class KNoScrollListBox: public QListBox
 {
     Q_OBJECT
   public:
     KNoScrollListBox(QWidget *parent=0, const char *name=0);
     ~KNoScrollListBox();
     QString getWhatsThisText(QPoint p) ;
 
   signals:
     void shiftDown();
     void shiftUp();
     void rightClick();
     void nextCell();
     void prevCell();
-    void highligtIncidence( Incidence * , MonthViewCell*, int );
+    void highlightIncidence( Incidence * , MonthViewCell*, int );
 
    protected slots:
     void oneDown();
     void keyPressEvent(QKeyEvent *);
     void keyReleaseEvent(QKeyEvent *);
     void mousePressEvent(QMouseEvent *); 
     void focusInEvent ( QFocusEvent * );
     void focusOutEvent ( QFocusEvent * ); 
 
  private:
     bool resetOnFocusIn;
     KNOWhatsThis * mWT;
 };
 
 
 class MonthViewItem: public QListBoxItem
@@ -124,33 +124,33 @@ class MonthViewItem: public QListBoxItem
     Incidence *incidence() const { return mIncidence; }
 
   protected:
     virtual void paint(QPainter *);
     virtual int height(const QListBox *) const;
     virtual int width(const QListBox *) const;
 
   private:
     int mdayPos;
     bool isWeekItem;
     bool mblockRepaint;
     int mMultiday;
     bool mRecur;
     bool mAlarm;
     bool mReply;
     bool mInfo;
-    bool mDisplayHightlighted;
+    bool mDisplayHighlighted;
 
     QPalette mPalette;
     QDate mDate;
 
     Incidence *mIncidence;
 };
 
 
 class KOMonthView;
 
 class MonthViewCell : public KNoScrollListBox
 {
     Q_OBJECT
   public:
     MonthViewCell(KOMonthView *,QWidget* );
     ~MonthViewCell() {mAvailItemList.setAutoDelete( true );}
@@ -165,34 +165,34 @@ class MonthViewCell : public KNoScrollListBox
     void setHoliday( const QString & );
 
     void updateCell();
     void startUpdateCell();
     void finishUpdateCell();
     void repaintfinishUpdateCell();
     int insertEvent(Event *);
     void insertTodo(Todo *);
 
     void updateConfig( bool bigFont = false );
 
     void enableScrollBars( bool );
 
     Incidence *selectedIncidence();
     QDate selectedIncidenceDate();
     QPushButton * dateLabel() { return mLabel; }
-    void deHightLight();
-    bool doHightLight( Incidence *);
+    void deHighLight();
+    bool doHighLight( Incidence *);
     void deselect();
     void select();
 #ifdef DESKTOP_VERSION
     static QToolTipGroup *toolTipGroup(); 
 #endif
   signals:
     void defaultAction( Incidence * );
     void newEventSignal( QDateTime );
     void showDaySignal( QDate );
     
   protected:
     QStringList mToolTip;
     void resizeEvent( QResizeEvent * );
 
 public slots:
     void showDay();