-rw-r--r-- | korganizer/kodaymatrix.cpp | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 52fd1e8..4f681b3 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -24,9 +24,18 @@ | |||
24 | 24 | ||
25 | #include <qevent.h> | 25 | #include <qevent.h> |
26 | #include <qpainter.h> | 26 | #include <qpainter.h> |
27 | #include <qptrlist.h> | 27 | #include <q3ptrlist.h> |
28 | #include <qtimer.h> | 28 | #include <qtimer.h> |
29 | #include <qwhatsthis.h> | 29 | #include <q3whatsthis.h> |
30 | //Added by qt3to4: | ||
31 | #include <QDragLeaveEvent> | ||
32 | #include <Q3Frame> | ||
33 | #include <QDragEnterEvent> | ||
34 | #include <QDragMoveEvent> | ||
35 | #include <QDropEvent> | ||
36 | #include <QResizeEvent> | ||
37 | #include <QMouseEvent> | ||
38 | #include <QPaintEvent> | ||
30 | 39 | ||
31 | #include <kglobal.h> | 40 | #include <kglobal.h> |
32 | #include <kdebug.h> | 41 | #include <kdebug.h> |
@@ -54,15 +63,15 @@ | |||
54 | // ============================================================================ | 63 | // ============================================================================ |
55 | 64 | ||
56 | DynamicTip::DynamicTip( QWidget * parent ) | 65 | DynamicTip::DynamicTip( QWidget * parent ) |
57 | : QToolTip( parent ) | 66 | /* TODO:hacker: : QToolTip( parent ) */ |
58 | { | 67 | { |
59 | matrix = (KODayMatrix*)parent; | 68 | matrix = (KODayMatrix*)parent; |
60 | } | 69 | } |
61 | 70 | ||
62 | class KODaymatrixWhatsThis :public QWhatsThis | 71 | class KODaymatrixWhatsThis :public Q3WhatsThis |
63 | { | 72 | { |
64 | public: | 73 | public: |
65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; | 74 | KODaymatrixWhatsThis( KODayMatrix* view ) : Q3WhatsThis( view ),_view (view) { ;}; |
66 | ~KODaymatrixWhatsThis() { ; }; | 75 | ~KODaymatrixWhatsThis() { ; }; |
67 | 76 | ||
68 | protected: | 77 | protected: |
@@ -91,7 +100,7 @@ void DynamicTip::maybeTip( const QPoint &pos ) | |||
91 | //show holiday names only | 100 | //show holiday names only |
92 | QString str = matrix->getHolidayLabel(col+row*7); | 101 | QString str = matrix->getHolidayLabel(col+row*7); |
93 | if (str.isEmpty()) return; | 102 | if (str.isEmpty()) return; |
94 | tip(rct, str); | 103 | /* TODO:hacker: tip(rct, str);*/ |
95 | } | 104 | } |
96 | 105 | ||
97 | 106 | ||
@@ -103,7 +112,7 @@ const int KODayMatrix::NOSELECTION = -1000; | |||
103 | const int KODayMatrix::NUMDAYS = 42; | 112 | const int KODayMatrix::NUMDAYS = 42; |
104 | 113 | ||
105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) | 114 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) |
106 | : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 ) | 115 | : Q3Frame( parent, name , Qt::WNoAutoErase ), mCalendar( 0 ) |
107 | 116 | ||
108 | 117 | ||
109 | { | 118 | { |
@@ -151,7 +160,7 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) | |||
151 | if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar ) | 160 | if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar ) |
152 | return QString(); | 161 | return QString(); |
153 | QDate mDate = days[tmp]; | 162 | QDate mDate = days[tmp]; |
154 | QPtrList<Event> eventlist = mCalendar->events(mDate); | 163 | Q3PtrList<Event> eventlist = mCalendar->events(mDate); |
155 | Event *event; | 164 | Event *event; |
156 | QStringList mToolTip; | 165 | QStringList mToolTip; |
157 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | 166 | for(event=eventlist.first();event != 0;event=eventlist.next()) { |
@@ -205,7 +214,7 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) | |||
205 | } | 214 | } |
206 | mToolTip.sort(); | 215 | mToolTip.sort(); |
207 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { | 216 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { |
208 | QPtrList<Todo> todolist = mCalendar->todos(mDate); | 217 | Q3PtrList<Todo> todolist = mCalendar->todos(mDate); |
209 | Todo *todo; | 218 | Todo *todo; |
210 | for(todo=todolist.first();todo != 0;todo=todolist.next()) { | 219 | for(todo=todolist.first();todo != 0;todo=todolist.next()) { |
211 | QString mToolTipText; | 220 | QString mToolTipText; |
@@ -220,7 +229,7 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) | |||
220 | } | 229 | } |
221 | } | 230 | } |
222 | if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { | 231 | if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { |
223 | QPtrList<Journal> j_list = mCalendar->journals4Date( mDate ); | 232 | Q3PtrList<Journal> j_list = mCalendar->journals4Date( mDate ); |
224 | Journal *j = j_list.first(); | 233 | Journal *j = j_list.first(); |
225 | while ( j ) { | 234 | while ( j ) { |
226 | QString mToolTipText; | 235 | QString mToolTipText; |
@@ -441,7 +450,7 @@ void KODayMatrix::updateViewTimed() | |||
441 | 450 | ||
442 | int i; | 451 | int i; |
443 | int timeSpan = NUMDAYS-1; | 452 | int timeSpan = NUMDAYS-1; |
444 | QPtrList<Event> events = mCalendar->events(); | 453 | Q3PtrList<Event> events = mCalendar->events(); |
445 | Event *event; | 454 | Event *event; |
446 | QDateTime dt; | 455 | QDateTime dt; |
447 | bool ok; | 456 | bool ok; |
@@ -526,7 +535,7 @@ void KODayMatrix::updateViewTimed() | |||
526 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { | 535 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { |
527 | bDays.fill( false); | 536 | bDays.fill( false); |
528 | // insert due todos | 537 | // insert due todos |
529 | QPtrList<Todo> todos = mCalendar->todos( ); | 538 | Q3PtrList<Todo> todos = mCalendar->todos( ); |
530 | Todo *todo; | 539 | Todo *todo; |
531 | for(todo = todos.first(); todo; todo = todos.next()) { | 540 | for(todo = todos.first(); todo; todo = todos.next()) { |
532 | //insertTodo( todo ); | 541 | //insertTodo( todo ); |
@@ -551,7 +560,7 @@ void KODayMatrix::updateViewTimed() | |||
551 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { | 560 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { |
552 | bDays.fill( false); | 561 | bDays.fill( false); |
553 | // insert due todos | 562 | // insert due todos |
554 | QPtrList<Journal> todos = mCalendar->journals( ); | 563 | Q3PtrList<Journal> todos = mCalendar->journals( ); |
555 | Journal *todo; | 564 | Journal *todo; |
556 | for(todo = todos.first(); todo; todo = todos.next()) { | 565 | for(todo = todos.first(); todo; todo = todos.next()) { |
557 | int day = mStartDate.daysTo( todo->dtStart().date() ); | 566 | int day = mStartDate.daysTo( todo->dtStart().date() ); |
@@ -575,7 +584,7 @@ void KODayMatrix::updateViewTimed() | |||
575 | //qDebug("KODayMatrix::updateViewTimed "); | 584 | //qDebug("KODayMatrix::updateViewTimed "); |
576 | for(int i = 0; i < NUMDAYS; i++) { | 585 | for(int i = 0; i < NUMDAYS; i++) { |
577 | // if events are set for the day then remember to draw it bold | 586 | // if events are set for the day then remember to draw it bold |
578 | QPtrList<Event> eventlist = mCalendar->events(days[i]); | 587 | Q3PtrList<Event> eventlist = mCalendar->events(days[i]); |
579 | Event *event; | 588 | Event *event; |
580 | int numEvents = eventlist.count(); | 589 | int numEvents = eventlist.count(); |
581 | QString holiStr = ""; | 590 | QString holiStr = ""; |
@@ -675,7 +684,7 @@ void KODayMatrix::updateEvents() | |||
675 | 684 | ||
676 | for( int i = 0; i < NUMDAYS; i++ ) { | 685 | for( int i = 0; i < NUMDAYS; i++ ) { |
677 | // if events are set for the day then remember to draw it bold | 686 | // if events are set for the day then remember to draw it bold |
678 | QPtrList<Event> eventlist = mCalendar->events( days[ i ] ); | 687 | Q3PtrList<Event> eventlist = mCalendar->events( days[ i ] ); |
679 | int numEvents = eventlist.count(); | 688 | int numEvents = eventlist.count(); |
680 | Event *event; | 689 | Event *event; |
681 | for( event = eventlist.first(); event != 0;event=eventlist.next()) { | 690 | for( event = eventlist.first(); event != 0;event=eventlist.next()) { |
@@ -739,7 +748,7 @@ int KODayMatrix::getDayIndexFrom(int x, int y) | |||
739 | void KODayMatrix::mousePressEvent (QMouseEvent* e) | 748 | void KODayMatrix::mousePressEvent (QMouseEvent* e) |
740 | { | 749 | { |
741 | 750 | ||
742 | if ( e->button() == LeftButton ) | 751 | if ( e->button() == Qt::LeftButton ) |
743 | mouseDown = true; | 752 | mouseDown = true; |
744 | mSelStart = getDayIndexFrom(e->x(), e->y()); | 753 | mSelStart = getDayIndexFrom(e->x(), e->y()); |
745 | if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1; | 754 | if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1; |
@@ -752,7 +761,7 @@ void KODayMatrix::mousePressEvent (QMouseEvent* e) | |||
752 | void KODayMatrix::mouseReleaseEvent (QMouseEvent* e) | 761 | void KODayMatrix::mouseReleaseEvent (QMouseEvent* e) |
753 | { | 762 | { |
754 | mRedrawNeeded = true; | 763 | mRedrawNeeded = true; |
755 | if ( e->button() == LeftButton ) | 764 | if ( e->button() == Qt::LeftButton ) |
756 | if ( ! mouseDown ) { | 765 | if ( ! mouseDown ) { |
757 | return; | 766 | return; |
758 | } | 767 | } |
@@ -1195,7 +1204,7 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
1195 | //qDebug("NO redraw "); | 1204 | //qDebug("NO redraw "); |
1196 | } | 1205 | } |
1197 | 1206 | ||
1198 | bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,CopyROP); | 1207 | bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,QPainter::CompositionMode_Source); |
1199 | mRedrawNeeded = false; | 1208 | mRedrawNeeded = false; |
1200 | } | 1209 | } |
1201 | 1210 | ||
@@ -1208,7 +1217,7 @@ void KODayMatrix::resizeEvent(QResizeEvent * e) | |||
1208 | QRect sz = frameRect(); | 1217 | QRect sz = frameRect(); |
1209 | daysize.setHeight(sz.height()*7 / NUMDAYS); | 1218 | daysize.setHeight(sz.height()*7 / NUMDAYS); |
1210 | daysize.setWidth(sz.width() / 7); | 1219 | daysize.setWidth(sz.width() / 7); |
1211 | QFrame::resizeEvent( e ); | 1220 | Q3Frame::resizeEvent( e ); |
1212 | } | 1221 | } |
1213 | 1222 | ||
1214 | QSize KODayMatrix::sizeHint() const | 1223 | QSize KODayMatrix::sizeHint() const |