summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-06-28 07:40:22 (UTC)
committer zautrix <zautrix>2005-06-28 07:40:22 (UTC)
commit4385e73c51688f0b8b21bfe061c04a6c42e92701 (patch) (side-by-side diff)
treecc55a5cdfa999b9e285d37116901f4c0a2357b20 /korganizer
parent386f48c2011e49c7c145bad7754a725cabc25dd5 (diff)
downloadkdepimpi-4385e73c51688f0b8b21bfe061c04a6c42e92701.zip
kdepimpi-4385e73c51688f0b8b21bfe061c04a6c42e92701.tar.gz
kdepimpi-4385e73c51688f0b8b21bfe061c04a6c42e92701.tar.bz2
fixx
Diffstat (limited to 'korganizer') (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
@@ -139,13 +139,13 @@ void KNoScrollListBox::focusOutEvent ( QFocusEvent * e )
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 ) {
@@ -284,42 +284,42 @@ MonthViewItem::MonthViewItem( Incidence *incidence, const QString & s)
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)
{
@@ -330,17 +330,17 @@ void MonthViewItem::paint(QPainter *p)
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 )
@@ -1097,31 +1097,31 @@ void MonthViewCell::contextMenu( QListBoxItem *item )
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 ) )
@@ -1240,13 +1240,13 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
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 );
@@ -1259,13 +1259,13 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
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();
@@ -1334,57 +1334,57 @@ 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 )
{
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 2622d10..0f3aa54 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -83,13 +83,13 @@ class KNoScrollListBox: public QListBox
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 *);
@@ -134,13 +134,13 @@ class MonthViewItem: public QListBoxItem
bool mblockRepaint;
int mMultiday;
bool mRecur;
bool mAlarm;
bool mReply;
bool mInfo;
- bool mDisplayHightlighted;
+ bool mDisplayHighlighted;
QPalette mPalette;
QDate mDate;
Incidence *mIncidence;
};
@@ -175,14 +175,14 @@ class MonthViewCell : public KNoScrollListBox
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: