author | zautrix <zautrix> | 2005-06-28 07:40:22 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-28 07:40:22 (UTC) |
commit | 4385e73c51688f0b8b21bfe061c04a6c42e92701 (patch) (unidiff) | |
tree | cc55a5cdfa999b9e285d37116901f4c0a2357b20 /korganizer | |
parent | 386f48c2011e49c7c145bad7754a725cabc25dd5 (diff) | |
download | kdepimpi-4385e73c51688f0b8b21bfe061c04a6c42e92701.zip kdepimpi-4385e73c51688f0b8b21bfe061c04a6c42e92701.tar.gz kdepimpi-4385e73c51688f0b8b21bfe061c04a6c42e92701.tar.bz2 |
fixx
-rw-r--r-- | korganizer/komonthview.cpp | 44 | ||||
-rw-r--r-- | korganizer/komonthview.h | 8 |
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 | |||
@@ -143,5 +143,5 @@ void KNoScrollListBox::focusOutEvent ( QFocusEvent * e ) | |||
143 | setVScrollBarMode(QScrollView::AlwaysOff); | 143 | setVScrollBarMode(QScrollView::AlwaysOff); |
144 | setHScrollBarMode(QScrollView::AlwaysOff); | 144 | setHScrollBarMode(QScrollView::AlwaysOff); |
145 | emit highligtIncidence( 0, (MonthViewCell*)this, 0 ); | 145 | emit highlightIncidence( 0, (MonthViewCell*)this, 0 ); |
146 | } | 146 | } |
147 | 147 | ||
@@ -288,5 +288,5 @@ MonthViewItem::MonthViewItem( Incidence *incidence, const QString & s) | |||
288 | void MonthViewItem::recycle( Incidence *incidence, const QString & s) | 288 | void MonthViewItem::recycle( Incidence *incidence, const QString & s) |
289 | { | 289 | { |
290 | mDisplayHightlighted = false; | 290 | mDisplayHighlighted = false; |
291 | setText( s ); | 291 | setText( s ); |
292 | mMultiday = 0; | 292 | mMultiday = 0; |
@@ -301,7 +301,7 @@ void MonthViewItem::recycle( Incidence *incidence, const QString & s) | |||
301 | bool MonthViewItem::setHighlightedFalse() | 301 | bool MonthViewItem::setHighlightedFalse() |
302 | { | 302 | { |
303 | if ( !mDisplayHightlighted ) | 303 | if ( !mDisplayHighlighted ) |
304 | return false; | 304 | return false; |
305 | mDisplayHightlighted = false; | 305 | mDisplayHighlighted = false; |
306 | return true; | 306 | return true; |
307 | } | 307 | } |
@@ -310,12 +310,12 @@ bool MonthViewItem::setHighlighted( Incidence * inc ) | |||
310 | { | 310 | { |
311 | if ( inc == mIncidence ) { | 311 | if ( inc == mIncidence ) { |
312 | if ( mDisplayHightlighted ) | 312 | if ( mDisplayHighlighted ) |
313 | return false; | 313 | return false; |
314 | mDisplayHightlighted = true; | 314 | mDisplayHighlighted = true; |
315 | return true; | 315 | return true; |
316 | } else { | 316 | } else { |
317 | if ( !mDisplayHightlighted ) | 317 | if ( !mDisplayHighlighted ) |
318 | return false; | 318 | return false; |
319 | mDisplayHightlighted = false; | 319 | mDisplayHighlighted = false; |
320 | return true; | 320 | return true; |
321 | } | 321 | } |
@@ -334,9 +334,9 @@ void MonthViewItem::paint(QPainter *p) | |||
334 | int heihei = height( listBox () ); | 334 | int heihei = height( listBox () ); |
335 | int x = 1; | 335 | int x = 1; |
336 | if (KOPrefs::instance()->mMonthViewUsesCategoryColor || mDisplayHightlighted || sel ) | 336 | if (KOPrefs::instance()->mMonthViewUsesCategoryColor || mDisplayHighlighted || sel ) |
337 | { | 337 | { |
338 | 338 | ||
339 | p->setBackgroundColor( palette().color( QPalette::Normal, \ | 339 | p->setBackgroundColor( palette().color( QPalette::Normal, \ |
340 | sel ||mDisplayHightlighted ? QColorGroup::Highlight : QColorGroup::Background ) ); | 340 | sel ||mDisplayHighlighted ? QColorGroup::Highlight : QColorGroup::Background ) ); |
341 | p->eraseRect( 0, 0, listBox()->maxItemWidth(), heihei ); | 341 | p->eraseRect( 0, 0, listBox()->maxItemWidth(), heihei ); |
342 | } | 342 | } |
@@ -1101,13 +1101,13 @@ void MonthViewCell::selection( QListBoxItem *item ) | |||
1101 | { | 1101 | { |
1102 | if ( !item ) { | 1102 | if ( !item ) { |
1103 | emit highligtIncidence( 0 , this, 0 ); | 1103 | emit highlightIncidence( 0 , this, 0 ); |
1104 | return; | 1104 | return; |
1105 | } | 1105 | } |
1106 | MonthViewItem * it = (static_cast<MonthViewItem *>( item )); | 1106 | MonthViewItem * it = (static_cast<MonthViewItem *>( item )); |
1107 | emit highligtIncidence( it->incidence(), this, it->multiDay() ); | 1107 | emit highlightIncidence( it->incidence(), this, it->multiDay() ); |
1108 | mMonthView->setSelectedCell( this ); | 1108 | mMonthView->setSelectedCell( this ); |
1109 | } | 1109 | } |
1110 | 1110 | ||
1111 | void MonthViewCell::deHightLight() | 1111 | void MonthViewCell::deHighLight() |
1112 | { | 1112 | { |
1113 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); | 1113 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); |
@@ -1119,5 +1119,5 @@ void MonthViewCell::deHightLight() | |||
1119 | } | 1119 | } |
1120 | // returns true if no inc found | 1120 | // returns true if no inc found |
1121 | bool MonthViewCell::doHightLight( Incidence * inc ) | 1121 | bool MonthViewCell::doHighLight( Incidence * inc ) |
1122 | { | 1122 | { |
1123 | 1123 | ||
@@ -1244,5 +1244,5 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | |||
1244 | connect( cell, SIGNAL( prevCell() ), | 1244 | connect( cell, SIGNAL( prevCell() ), |
1245 | SLOT( prevCell() ) ); | 1245 | SLOT( prevCell() ) ); |
1246 | connect( cell, SIGNAL( highligtIncidence( Incidence * , MonthViewCell *, int ) ), | 1246 | connect( cell, SIGNAL( highlightIncidence( Incidence * , MonthViewCell *, int ) ), |
1247 | SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) )); | 1247 | SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) )); |
1248 | } | 1248 | } |
@@ -1263,5 +1263,5 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | |||
1263 | connect( cell, SIGNAL( prevCell() ), | 1263 | connect( cell, SIGNAL( prevCell() ), |
1264 | SLOT( prevCell() ) ); | 1264 | SLOT( prevCell() ) ); |
1265 | connect( cell, SIGNAL( highligtIncidence( Incidence * , MonthViewCell *, int ) ), | 1265 | connect( cell, SIGNAL( highlightIncidence( Incidence * , MonthViewCell *, int ) ), |
1266 | SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) )); | 1266 | SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) )); |
1267 | cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont ); | 1267 | cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont ); |
@@ -1338,5 +1338,5 @@ KOMonthView::~KOMonthView() | |||
1338 | void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int mday ) | 1338 | void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int mday ) |
1339 | { | 1339 | { |
1340 | //qDebug("KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday ); | 1340 | qDebug("11 KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday ); |
1341 | static Incidence * lastInc = 0; | 1341 | static Incidence * lastInc = 0; |
1342 | static MonthViewCell * lastCell = 0; | 1342 | static MonthViewCell * lastCell = 0; |
@@ -1346,5 +1346,5 @@ void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int | |||
1346 | lastInc = inc; | 1346 | lastInc = inc; |
1347 | lastCell = mc; | 1347 | lastCell = mc; |
1348 | //qDebug("KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday ); | 1348 | qDebug("222 KOMonthView::incidenceHighlighted %d %d %d", inc, mc, mday ); |
1349 | 1349 | ||
1350 | bool weekview = false; | 1350 | bool weekview = false; |
@@ -1359,5 +1359,5 @@ void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int | |||
1359 | QPtrVector<MonthViewCell> *cells; | 1359 | QPtrVector<MonthViewCell> *cells; |
1360 | if ( weekview ) | 1360 | if ( weekview ) |
1361 | cells = &mCellsW; | 1361 | cells = &mCellsW; |
1362 | else { | 1362 | else { |
1363 | for (uint i = 0; i < mCells.count(); ++i) { | 1363 | for (uint i = 0; i < mCells.count(); ++i) { |
@@ -1370,5 +1370,5 @@ void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int | |||
1370 | } | 1370 | } |
1371 | for (uint i = 0; i < (*cells).count(); ++i) { | 1371 | for (uint i = 0; i < (*cells).count(); ++i) { |
1372 | (*cells)[i]->deHightLight(); | 1372 | (*cells)[i]->deHighLight(); |
1373 | } | 1373 | } |
1374 | if ( ! inc ) | 1374 | if ( ! inc ) |
@@ -1377,10 +1377,10 @@ void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int | |||
1377 | for (int i = index-1; i >= 0; --i) { | 1377 | for (int i = index-1; i >= 0; --i) { |
1378 | //qDebug("index %d iii %d ", index, i); | 1378 | //qDebug("index %d iii %d ", index, i); |
1379 | if ( (*cells)[(uint)i]->doHightLight(inc) ) | 1379 | if ( (*cells)[(uint)i]->doHighLight(inc) ) |
1380 | break; | 1380 | break; |
1381 | } | 1381 | } |
1382 | if ( mday < 3 && mday > 0 && index < (*cells).count()-1) | 1382 | if ( mday < 3 && mday > 0 && index < (*cells).count()-1) |
1383 | for (uint i = index+1; i < (*cells).count(); ++i) { | 1383 | for (uint i = index+1; i < (*cells).count(); ++i) { |
1384 | if ( (*cells)[i]->doHightLight(inc) ) | 1384 | if ( (*cells)[i]->doHighLight(inc) ) |
1385 | break; | 1385 | break; |
1386 | } | 1386 | } |
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index 2622d10..0f3aa54 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -87,5 +87,5 @@ class KNoScrollListBox: public QListBox | |||
87 | void nextCell(); | 87 | void nextCell(); |
88 | void prevCell(); | 88 | void prevCell(); |
89 | void highligtIncidence( Incidence * , MonthViewCell*, int ); | 89 | void highlightIncidence( Incidence * , MonthViewCell*, int ); |
90 | 90 | ||
91 | protected slots: | 91 | protected slots: |
@@ -138,5 +138,5 @@ class MonthViewItem: public QListBoxItem | |||
138 | bool mReply; | 138 | bool mReply; |
139 | bool mInfo; | 139 | bool mInfo; |
140 | bool mDisplayHightlighted; | 140 | bool mDisplayHighlighted; |
141 | 141 | ||
142 | QPalette mPalette; | 142 | QPalette mPalette; |
@@ -179,6 +179,6 @@ class MonthViewCell : public KNoScrollListBox | |||
179 | QDate selectedIncidenceDate(); | 179 | QDate selectedIncidenceDate(); |
180 | QPushButton * dateLabel() { return mLabel; } | 180 | QPushButton * dateLabel() { return mLabel; } |
181 | void deHightLight(); | 181 | void deHighLight(); |
182 | bool doHightLight( Incidence *); | 182 | bool doHighLight( Incidence *); |
183 | void deselect(); | 183 | void deselect(); |
184 | void select(); | 184 | void select(); |