summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/komonthview.cpp44
-rw-r--r--korganizer/komonthview.h8
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
@@ -142,7 +142,7 @@ void KNoScrollListBox::focusOutEvent ( QFocusEvent * e )
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)
@@ -287,7 +287,7 @@ MonthViewItem::MonthViewItem( Incidence *incidence, const QString & s)
}
void MonthViewItem::recycle( Incidence *incidence, const QString & s)
{
- mDisplayHightlighted = false;
+ mDisplayHighlighted = false;
setText( s );
mMultiday = 0;
mIncidence = incidence;
@@ -300,23 +300,23 @@ void MonthViewItem::recycle( Incidence *incidence, const QString & s)
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;
@@ -333,11 +333,11 @@ void MonthViewItem::paint(QPainter *p)
#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 );
}
@@ -1100,15 +1100,15 @@ void MonthViewCell::contextMenu( QListBoxItem *item )
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 ) {
@@ -1118,7 +1118,7 @@ void MonthViewCell::deHightLight()
}
}
// returns true if no inc found
-bool MonthViewCell::doHightLight( Incidence * inc )
+bool MonthViewCell::doHighLight( Incidence * inc )
{
MonthViewItem *mitem = (MonthViewItem*) firstItem ();
@@ -1243,7 +1243,7 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
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 ) ));
}
}
@@ -1262,7 +1262,7 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
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 );
}
@@ -1337,7 +1337,7 @@ KOMonthView::~KOMonthView()
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;
@@ -1345,7 +1345,7 @@ void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int
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;
@@ -1358,7 +1358,7 @@ void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int
}
QPtrVector<MonthViewCell> *cells;
if ( weekview )
- cells = &mCellsW;
+ cells = &mCellsW;
else {
for (uint i = 0; i < mCells.count(); ++i) {
if ( mCells[i] == mc ) {
@@ -1369,19 +1369,19 @@ void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int
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;
}
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 2622d10..0f3aa54 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -86,7 +86,7 @@ class KNoScrollListBox: public QListBox
void rightClick();
void nextCell();
void prevCell();
- void highligtIncidence( Incidence * , MonthViewCell*, int );
+ void highlightIncidence( Incidence * , MonthViewCell*, int );
protected slots:
void oneDown();
@@ -137,7 +137,7 @@ class MonthViewItem: public QListBoxItem
bool mAlarm;
bool mReply;
bool mInfo;
- bool mDisplayHightlighted;
+ bool mDisplayHighlighted;
QPalette mPalette;
QDate mDate;
@@ -178,8 +178,8 @@ class MonthViewCell : public KNoScrollListBox
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