-rw-r--r-- | korganizer/koagendaitem.cpp | 1 | ||||
-rw-r--r-- | korganizer/koagendaitem.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 81681df..b416115 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -543,97 +543,96 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e ) | |||
543 | paintFrom = paintPix(); | 543 | paintFrom = paintPix(); |
544 | } | 544 | } |
545 | xx += rx; | 545 | xx += rx; |
546 | 546 | ||
547 | if ( xx < 0 ) { | 547 | if ( xx < 0 ) { |
548 | rw = rw + xx; | 548 | rw = rw + xx; |
549 | rx -= xx; | 549 | rx -= xx; |
550 | xx = 0; | 550 | xx = 0; |
551 | if ( rw <= 1 ) { | 551 | if ( rw <= 1 ) { |
552 | //qDebug("KOAgendaItem::Width1 <= 1 (%d). Returning. %s",rw,mDisplayedText.latin1()); | 552 | //qDebug("KOAgendaItem::Width1 <= 1 (%d). Returning. %s",rw,mDisplayedText.latin1()); |
553 | return; | 553 | return; |
554 | } | 554 | } |
555 | } | 555 | } |
556 | if ( paintFrom->width() < xx+rw ) { | 556 | if ( paintFrom->width() < xx+rw ) { |
557 | rw = paintFrom->width() - xx; | 557 | rw = paintFrom->width() - xx; |
558 | if ( rw <= 1 ) { | 558 | if ( rw <= 1 ) { |
559 | //qDebug("KOAgendaItem::Width2 <= 1 (%d). Returning.%s ",rw,mDisplayedText.latin1() ); | 559 | //qDebug("KOAgendaItem::Width2 <= 1 (%d). Returning.%s ",rw,mDisplayedText.latin1() ); |
560 | return; | 560 | return; |
561 | } | 561 | } |
562 | } | 562 | } |
563 | //qDebug("%d %d %d %d %d %d %d",rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh); | 563 | //qDebug("%d %d %d %d %d %d %d",rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh); |
564 | bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,CopyROP); | 564 | bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,CopyROP); |
565 | } | 565 | } |
566 | void KOAgendaItem::computeText() | 566 | void KOAgendaItem::computeText() |
567 | { | 567 | { |
568 | mDisplayedText = mIncidence->summary(); | 568 | mDisplayedText = mIncidence->summary(); |
569 | if ( (mIncidence->typeID() == todoID ) ) { | 569 | if ( (mIncidence->typeID() == todoID ) ) { |
570 | if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) { | 570 | if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) { |
571 | if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() ) | 571 | if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() ) |
572 | mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")"; | 572 | mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")"; |
573 | else if ( !(mIncidence->doesFloat())) | 573 | else if ( !(mIncidence->doesFloat())) |
574 | mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")"; | 574 | mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")"; |
575 | } | 575 | } |
576 | } else { | 576 | } else { |
577 | if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda) | 577 | if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda) |
578 | mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + " - " + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ; | 578 | mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + " - " + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ; |
579 | 579 | ||
580 | if ( mAllDay ) { | 580 | if ( mAllDay ) { |
581 | if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) { | 581 | if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) { |
582 | if ( mIncidence->doesRecur() ) { | 582 | if ( mIncidence->doesRecur() ) { |
583 | mDisplayedText += " (" + mIncidence->recurrence()->recurrenceText() + ")"; | 583 | mDisplayedText += " (" + mIncidence->recurrence()->recurrenceText() + ")"; |
584 | } else { | 584 | } else { |
585 | int dur = 1+ (static_cast<Event*>(mIncidence))->dtStart().date().daysTo( (static_cast<Event*>(mIncidence))->dtEnd().date() ); | 585 | int dur = 1+ (static_cast<Event*>(mIncidence))->dtStart().date().daysTo( (static_cast<Event*>(mIncidence))->dtEnd().date() ); |
586 | mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) + " ("+QString::number( dur )+i18n(" days") +")" ; | 586 | mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) + " ("+QString::number( dur )+i18n(" days") +")" ; |
587 | } | 587 | } |
588 | } | 588 | } |
589 | } | 589 | } |
590 | } | 590 | } |
591 | |||
592 | if ( !mIncidence->location().isEmpty() ) { | 591 | if ( !mIncidence->location().isEmpty() ) { |
593 | if ( mAllDay ) | 592 | if ( mAllDay ) |
594 | mDisplayedText += " ("; | 593 | mDisplayedText += " ("; |
595 | else | 594 | else |
596 | mDisplayedText += "\n("; | 595 | mDisplayedText += "\n("; |
597 | mDisplayedText += mIncidence->location() +")"; | 596 | mDisplayedText += mIncidence->location() +")"; |
598 | } | 597 | } |
599 | #ifdef DESKTOP_VERSION | 598 | #ifdef DESKTOP_VERSION |
600 | QString tipText = mIncidence->summary(); | 599 | QString tipText = mIncidence->summary(); |
601 | if ( !mIncidence->doesFloat() ) { | 600 | if ( !mIncidence->doesFloat() ) { |
602 | if ( mIncidence->typeID() == eventID ) { | 601 | if ( mIncidence->typeID() == eventID ) { |
603 | if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) { | 602 | if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) { |
604 | tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr(); | 603 | tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr(); |
605 | tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr(); | 604 | tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr(); |
606 | } | 605 | } |
607 | else { | 606 | else { |
608 | tipText += "\n"+i18n("Time: ")+mIncidence->dtStartTimeStr(); | 607 | tipText += "\n"+i18n("Time: ")+mIncidence->dtStartTimeStr(); |
609 | tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr(); | 608 | tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr(); |
610 | } | 609 | } |
611 | } | 610 | } |
612 | else if ( mIncidence->typeID() == todoID ) { | 611 | else if ( mIncidence->typeID() == todoID ) { |
613 | if (mIncidence->hasStartDate()) | 612 | if (mIncidence->hasStartDate()) |
614 | tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartStr(); | 613 | tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartStr(); |
615 | if (((Todo*)mIncidence)->hasDueDate()) | 614 | if (((Todo*)mIncidence)->hasDueDate()) |
616 | tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueStr(); | 615 | tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueStr(); |
617 | } | 616 | } |
618 | } else if ( mIncidence->typeID() == todoID ) { | 617 | } else if ( mIncidence->typeID() == todoID ) { |
619 | if (mIncidence->hasStartDate()) | 618 | if (mIncidence->hasStartDate()) |
620 | tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartDateStr(); | 619 | tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartDateStr(); |
621 | if (((Todo*)mIncidence)->hasDueDate()) | 620 | if (((Todo*)mIncidence)->hasDueDate()) |
622 | tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueDateStr(); | 621 | tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueDateStr(); |
623 | } | 622 | } |
624 | 623 | ||
625 | if (!mIncidence->location().isEmpty()) { | 624 | if (!mIncidence->location().isEmpty()) { |
626 | tipText += "\n"+i18n("Location: ")+mIncidence->location(); | 625 | tipText += "\n"+i18n("Location: ")+mIncidence->location(); |
627 | } | 626 | } |
628 | QToolTip::add(this,tipText,toolTipGroup(),""); | 627 | QToolTip::add(this,tipText,toolTipGroup(),""); |
629 | #endif | 628 | #endif |
630 | } | 629 | } |
631 | void KOAgendaItem::updateItem() | 630 | void KOAgendaItem::updateItem() |
632 | { | 631 | { |
633 | computeText(); | 632 | computeText(); |
634 | 633 | ||
635 | //qDebug("KOAgendaItem:: updateItem() %s %d %d ",incidence()->summary().latin1(), x(), y()); | 634 | //qDebug("KOAgendaItem:: updateItem() %s %d %d ",incidence()->summary().latin1(), x(), y()); |
636 | paintMe( mSelected ); | 635 | paintMe( mSelected ); |
637 | repaint( false); | 636 | repaint( false); |
638 | } | 637 | } |
639 | 638 | ||
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h index 37d89a6..27ee720 100644 --- a/korganizer/koagendaitem.h +++ b/korganizer/koagendaitem.h | |||
@@ -64,97 +64,97 @@ class KOAgendaItem : public QWidget | |||
64 | void setCellXWidth(int xwidth); | 64 | void setCellXWidth(int xwidth); |
65 | void setSubCell(int subCell); | 65 | void setSubCell(int subCell); |
66 | void setSubCells(int subCells); | 66 | void setSubCells(int subCells); |
67 | 67 | ||
68 | /** Start movement */ | 68 | /** Start movement */ |
69 | void startMove(); | 69 | void startMove(); |
70 | /** Reset to original values */ | 70 | /** Reset to original values */ |
71 | void resetMove(); | 71 | void resetMove(); |
72 | 72 | ||
73 | void moveRelative(int dx,int dy); | 73 | void moveRelative(int dx,int dy); |
74 | void expandTop(int dy); | 74 | void expandTop(int dy); |
75 | void expandBottom(int dy); | 75 | void expandBottom(int dy); |
76 | void expandLeft(int dx); | 76 | void expandLeft(int dx); |
77 | void expandRight(int dx); | 77 | void expandRight(int dx); |
78 | int mLastMoveXPos; | 78 | int mLastMoveXPos; |
79 | 79 | ||
80 | void setMultiItem(KOAgendaItem *first,KOAgendaItem *next, | 80 | void setMultiItem(KOAgendaItem *first,KOAgendaItem *next, |
81 | KOAgendaItem *last); | 81 | KOAgendaItem *last); |
82 | KOAgendaItem *firstMultiItem() { return mFirstMultiItem; } | 82 | KOAgendaItem *firstMultiItem() { return mFirstMultiItem; } |
83 | KOAgendaItem *nextMultiItem() { return mNextMultiItem; } | 83 | KOAgendaItem *nextMultiItem() { return mNextMultiItem; } |
84 | KOAgendaItem *lastMultiItem() { return mLastMultiItem; } | 84 | KOAgendaItem *lastMultiItem() { return mLastMultiItem; } |
85 | 85 | ||
86 | Incidence *incidence() const { return mIncidence; } | 86 | Incidence *incidence() const { return mIncidence; } |
87 | QDate itemDate() { return mDate; } | 87 | QDate itemDate() { return mDate; } |
88 | 88 | ||
89 | /** Update the date of this item's occurence (not in the event) */ | 89 | /** Update the date of this item's occurence (not in the event) */ |
90 | void setItemDate(QDate qd); | 90 | void setItemDate(QDate qd); |
91 | 91 | ||
92 | void setText ( const QString & text ) { mDisplayedText = text; } | 92 | void setText ( const QString & text ) { mDisplayedText = text; } |
93 | QString text () { return mDisplayedText; } | 93 | QString text () { return mDisplayedText; } |
94 | 94 | ||
95 | virtual bool eventFilter ( QObject *, QEvent * ); | 95 | virtual bool eventFilter ( QObject *, QEvent * ); |
96 | 96 | ||
97 | static QToolTipGroup *toolTipGroup(); | 97 | static QToolTipGroup *toolTipGroup(); |
98 | 98 | ||
99 | QPtrList<KOAgendaItem> conflictItems(); | 99 | QPtrList<KOAgendaItem> conflictItems(); |
100 | void setConflictItems(QPtrList<KOAgendaItem>); | 100 | void setConflictItems(QPtrList<KOAgendaItem>); |
101 | void addConflictItem(KOAgendaItem *ci); | 101 | void addConflictItem(KOAgendaItem *ci); |
102 | void paintMe( bool, QPainter* painter = 0 ); | 102 | void paintMe( bool, QPainter* painter = 0 ); |
103 | void repaintMe(); | 103 | void repaintMe(); |
104 | static QPixmap * paintPix(); | 104 | static QPixmap * paintPix(); |
105 | static QPixmap * paintPixAllday(); | 105 | static QPixmap * paintPixAllday(); |
106 | void updateItem(); | 106 | void updateItem(); |
107 | void computeText(); | 107 | void computeText(); |
108 | void recreateIncidence(); | 108 | void recreateIncidence(); |
109 | bool checkLayout(); | 109 | bool checkLayout(); |
110 | void initColor (); | 110 | void initColor (); |
111 | bool isAllDay() { return mAllDay; } | 111 | bool isAllDay() { return mAllDay; } |
112 | int resizeMe( int grid, int wid, int hei, bool invalidHei = false ); | 112 | int resizeMe( int grid, int wid, int hei, bool invalidWidth = false ); |
113 | public slots: | 113 | public slots: |
114 | bool updateIcons( QPainter *, bool ); | 114 | bool updateIcons( QPainter *, bool ); |
115 | void select(bool=true); | 115 | void select(bool=true); |
116 | void repaintItem(); | 116 | void repaintItem(); |
117 | 117 | ||
118 | protected: | 118 | protected: |
119 | void dragEnterEvent(QDragEnterEvent *e); | 119 | void dragEnterEvent(QDragEnterEvent *e); |
120 | void dropEvent(QDropEvent *e); | 120 | void dropEvent(QDropEvent *e); |
121 | void paintEvent ( QPaintEvent * ); | 121 | void paintEvent ( QPaintEvent * ); |
122 | void resizeEvent ( QResizeEvent *ev ); | 122 | void resizeEvent ( QResizeEvent *ev ); |
123 | 123 | ||
124 | private: | 124 | private: |
125 | KOAgendaItemWhatsThis* mKOAgendaItemWhatsThis; | 125 | KOAgendaItemWhatsThis* mKOAgendaItemWhatsThis; |
126 | bool mAllDay; | 126 | bool mAllDay; |
127 | bool mWhiteText; | 127 | bool mWhiteText; |
128 | int mCellX; | 128 | int mCellX; |
129 | int mCellXWidth; | 129 | int mCellXWidth; |
130 | int mCellYTop,mCellYBottom; | 130 | int mCellYTop,mCellYBottom; |
131 | int mSubCell; // subcell number of this item | 131 | int mSubCell; // subcell number of this item |
132 | int mSubCells; // Total number of subcells in cell of this item | 132 | int mSubCells; // Total number of subcells in cell of this item |
133 | int xPaintCoord; | 133 | int xPaintCoord; |
134 | int yPaintCoord; | 134 | int yPaintCoord; |
135 | int wPaintCoord; | 135 | int wPaintCoord; |
136 | int hPaintCoord; | 136 | int hPaintCoord; |
137 | // Variables to remember start position | 137 | // Variables to remember start position |
138 | int mStartCellX; | 138 | int mStartCellX; |
139 | int mStartCellXWidth; | 139 | int mStartCellXWidth; |
140 | int mStartCellYTop,mStartCellYBottom; | 140 | int mStartCellYTop,mStartCellYBottom; |
141 | int mLastMovePos; | 141 | int mLastMovePos; |
142 | 142 | ||
143 | // Multi item pointers | 143 | // Multi item pointers |
144 | KOAgendaItem *mFirstMultiItem; | 144 | KOAgendaItem *mFirstMultiItem; |
145 | KOAgendaItem *mNextMultiItem; | 145 | KOAgendaItem *mNextMultiItem; |
146 | KOAgendaItem *mLastMultiItem; | 146 | KOAgendaItem *mLastMultiItem; |
147 | 147 | ||
148 | int mFontPixelSize; | 148 | int mFontPixelSize; |
149 | Incidence *mIncidence; // corresponding event or todo | 149 | Incidence *mIncidence; // corresponding event or todo |
150 | QDate mDate; //date this events occurs (for recurrence) | 150 | QDate mDate; //date this events occurs (for recurrence) |
151 | //void showIcon( QLabel*, int ); | 151 | //void showIcon( QLabel*, int ); |
152 | //QLabel *mTodoIconLabel; | 152 | //QLabel *mTodoIconLabel; |
153 | //QLabel *mItemLabel; | 153 | //QLabel *mItemLabel; |
154 | //QWidget *mIconBox; | 154 | //QWidget *mIconBox; |
155 | //QLabel *mIconAlarm,*mIconRecur,*mIconReadonly; | 155 | //QLabel *mIconAlarm,*mIconRecur,*mIconReadonly; |
156 | //QLabel *mIconReply,*mIconGroup,*mIconOrganizer; | 156 | //QLabel *mIconReply,*mIconGroup,*mIconOrganizer; |
157 | //QLabel *mIconMoreInfo; | 157 | //QLabel *mIconMoreInfo; |
158 | static QToolTipGroup *mToolTipGroup; | 158 | static QToolTipGroup *mToolTipGroup; |
159 | 159 | ||
160 | QColor mBackgroundColor; | 160 | QColor mBackgroundColor; |