-rw-r--r-- | bin/kdepim/WhatsNew.txt | 2 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 32 | ||||
-rw-r--r-- | korganizer/komonthview.h | 5 |
3 files changed, 35 insertions, 4 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index d4b7971..95a1866 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -15,4 +15,6 @@ Changed "ME" menu bar entry to an icon. | |||
15 | KO/Pi: | 15 | KO/Pi: |
16 | Fixed two minor bugs in displaying todos. | 16 | Fixed two minor bugs in displaying todos. |
17 | If in month view a cell is selected, the key shortcut "d" shows now that date. | ||
18 | Added complete info for a todo in month view as an icon left of the text. | ||
17 | 19 | ||
18 | 20 | ||
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index f983ff9..4bf9dea 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -278,4 +278,20 @@ void MonthViewItem::paint(QPainter *p) | |||
278 | x += sizeM + 1; | 278 | x += sizeM + 1; |
279 | } | 279 | } |
280 | |||
281 | if ( mIncidence->type() == "Todo" ){ | ||
282 | Todo* td = ( Todo* ) mIncidence; | ||
283 | if ( td->isCompleted() ) { | ||
284 | int half = size/2; | ||
285 | p->drawLine ( x, heihei/2, x +half , heihei/2 +half ) ; | ||
286 | p->drawLine ( x +half , heihei/2 +half , x +half+half +2 , heihei/2 -2 ) ; | ||
287 | x += half+half + 4; | ||
288 | |||
289 | } else { | ||
290 | int val = td->percentComplete()/20; | ||
291 | p->fillRect ( x+1, y-1, val ,size+2,Qt::black ); | ||
292 | p->drawRect ( x, y-1,7,size+2); | ||
293 | x += size + 3; | ||
294 | } | ||
295 | } | ||
280 | QFontMetrics fm = p->fontMetrics(); | 296 | QFontMetrics fm = p->fontMetrics(); |
281 | int yPos; | 297 | int yPos; |
@@ -603,5 +619,5 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
603 | } | 619 | } |
604 | } | 620 | } |
605 | text += i18n("T: %1").arg(todo->summary()); | 621 | text += todo->summary(); |
606 | 622 | ||
607 | MonthViewItem *item = new MonthViewItem( todo, mDate, text ); | 623 | MonthViewItem *item = new MonthViewItem( todo, mDate, text ); |
@@ -662,5 +678,5 @@ void MonthViewCell::finishUpdateCell() | |||
662 | void MonthViewCell::updateCell() | 678 | void MonthViewCell::updateCell() |
663 | { | 679 | { |
664 | qDebug("MonthViewCell::updateCell() "); | 680 | //qDebug("MonthViewCell::updateCell() "); |
665 | if ( !mMonthView->isUpdatePossible() ) | 681 | if ( !mMonthView->isUpdatePossible() ) |
666 | return; | 682 | return; |
@@ -1219,4 +1235,5 @@ void KOMonthView::updateView() | |||
1219 | //QTime ti; | 1235 | //QTime ti; |
1220 | //ti.start(); | 1236 | //ti.start(); |
1237 | clearSelection(); | ||
1221 | QPtrVector<MonthViewCell> *cells; | 1238 | QPtrVector<MonthViewCell> *cells; |
1222 | if ( mShowWeekView ) { | 1239 | if ( mShowWeekView ) { |
@@ -1594,5 +1611,5 @@ MonthViewCell * KOMonthView::selectedCell( ) | |||
1594 | void KOMonthView::setSelectedCell( MonthViewCell *cell ) | 1611 | void KOMonthView::setSelectedCell( MonthViewCell *cell ) |
1595 | { | 1612 | { |
1596 | // qDebug("KOMonthView::setSelectedCell "); | 1613 | //qDebug("KOMonthView::setSelectedCell "); |
1597 | if ( mSelectedCell && mSelectedCell != cell ) { | 1614 | if ( mSelectedCell && mSelectedCell != cell ) { |
1598 | MonthViewCell * mvc = mSelectedCell; | 1615 | MonthViewCell * mvc = mSelectedCell; |
@@ -1616,4 +1633,5 @@ void KOMonthView::processSelectionChange() | |||
1616 | } else { | 1633 | } else { |
1617 | emit incidenceSelected( 0 ); | 1634 | emit incidenceSelected( 0 ); |
1635 | clearSelection(); | ||
1618 | } | 1636 | } |
1619 | } | 1637 | } |
@@ -1664,4 +1682,12 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e ) | |||
1664 | e->accept(); | 1682 | e->accept(); |
1665 | break; | 1683 | break; |
1684 | case Key_D: | ||
1685 | if ( mSelectedCell ) { | ||
1686 | mSelectedCell->showDay(); | ||
1687 | e->accept(); | ||
1688 | } else { | ||
1689 | e->ignore(); | ||
1690 | } | ||
1691 | break; | ||
1666 | default: | 1692 | default: |
1667 | e->ignore(); | 1693 | e->ignore(); |
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index f92a69a..fd8cbf2 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -171,4 +171,8 @@ class MonthViewCell : public QWidget | |||
171 | void resizeEvent( QResizeEvent * ); | 171 | void resizeEvent( QResizeEvent * ); |
172 | 172 | ||
173 | |||
174 | public slots: | ||
175 | void showDay(); | ||
176 | |||
173 | protected slots: | 177 | protected slots: |
174 | void defaultAction( QListBoxItem * ); | 178 | void defaultAction( QListBoxItem * ); |
@@ -177,5 +181,4 @@ class MonthViewCell : public QWidget | |||
177 | void cellClicked( QListBoxItem * ); | 181 | void cellClicked( QListBoxItem * ); |
178 | void newEvent(); | 182 | void newEvent(); |
179 | void showDay(); | ||
180 | 183 | ||
181 | private: | 184 | private: |