-rw-r--r-- | korganizer/kodaymatrix.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index df606d0..c32a2a4 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -42,95 +42,93 @@ | |||
42 | #include <kcalendarsystem.h> | 42 | #include <kcalendarsystem.h> |
43 | 43 | ||
44 | #ifndef KORG_NOPLUGINS | 44 | #ifndef KORG_NOPLUGINS |
45 | #include "kocore.h" | 45 | #include "kocore.h" |
46 | #endif | 46 | #endif |
47 | #include "koprefs.h" | 47 | #include "koprefs.h" |
48 | #include "koglobals.h" | 48 | #include "koglobals.h" |
49 | 49 | ||
50 | #include "kodaymatrix.h" | 50 | #include "kodaymatrix.h" |
51 | 51 | ||
52 | // ============================================================================ | 52 | // ============================================================================ |
53 | // D Y N A M I C T I P | 53 | // D Y N A M I C T I P |
54 | // ============================================================================ | 54 | // ============================================================================ |
55 | 55 | ||
56 | DynamicTip::DynamicTip( QWidget * parent ) | 56 | DynamicTip::DynamicTip( QWidget * parent ) |
57 | : QToolTip( parent ) | 57 | : QToolTip( parent ) |
58 | { | 58 | { |
59 | matrix = (KODayMatrix*)parent; | 59 | matrix = (KODayMatrix*)parent; |
60 | } | 60 | } |
61 | 61 | ||
62 | class KODaymatrixWhatsThis :public QWhatsThis | 62 | class KODaymatrixWhatsThis :public QWhatsThis |
63 | { | 63 | { |
64 | public: | 64 | public: |
65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; | 65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; |
66 | ~KODaymatrixWhatsThis() { ; }; | 66 | ~KODaymatrixWhatsThis() { qDebug("DELETE KODaymatrixWhatsThis "); }; |
67 | 67 | ||
68 | protected: | 68 | protected: |
69 | virtual QString text( const QPoint& p ) | 69 | virtual QString text( const QPoint& p ) |
70 | { | 70 | { |
71 | return _view->getWhatsThisText( p ) ; | 71 | return _view->getWhatsThisText( p ) ; |
72 | } | 72 | } |
73 | private: | 73 | private: |
74 | KODayMatrix * _view; | 74 | KODayMatrix * _view; |
75 | }; | 75 | }; |
76 | 76 | ||
77 | void DynamicTip::maybeTip( const QPoint &pos ) | 77 | void DynamicTip::maybeTip( const QPoint &pos ) |
78 | { | 78 | { |
79 | //calculate which cell of the matrix the mouse is in | 79 | //calculate which cell of the matrix the mouse is in |
80 | QRect sz = matrix->frameRect(); | 80 | QRect sz = matrix->frameRect(); |
81 | int dheight = sz.height()*7 / 42; | 81 | int dheight = sz.height()*7 / 42; |
82 | int dwidth = sz.width() / 7; | 82 | int dwidth = sz.width() / 7; |
83 | int row = pos.y()/dheight; | 83 | int row = pos.y()/dheight; |
84 | int col = pos.x()/dwidth; | 84 | int col = pos.x()/dwidth; |
85 | 85 | ||
86 | QRect rct(col*dwidth, row*dheight, dwidth, dheight); | 86 | QRect rct(col*dwidth, row*dheight, dwidth, dheight); |
87 | 87 | ||
88 | // kdDebug() << "DynamicTip::maybeTip matrix cell index [" << | 88 | // kdDebug() << "DynamicTip::maybeTip matrix cell index [" << |
89 | // col << "][" << row << "] => " <<(col+row*7) << endl; | 89 | // col << "][" << row << "] => " <<(col+row*7) << endl; |
90 | 90 | ||
91 | //show holiday names only | 91 | //show holiday names only |
92 | QString str = matrix->getHolidayLabel(col+row*7); | 92 | QString str = matrix->getHolidayLabel(col+row*7); |
93 | if (str.isEmpty()) return; | 93 | if (str.isEmpty()) return; |
94 | tip(rct, str); | 94 | tip(rct, str); |
95 | } | 95 | } |
96 | 96 | ||
97 | 97 | ||
98 | // ============================================================================ | 98 | // ============================================================================ |
99 | // K O D A Y M A T R I X | 99 | // K O D A Y M A T R I X |
100 | // ============================================================================ | 100 | // ============================================================================ |
101 | 101 | ||
102 | const int KODayMatrix::NOSELECTION = -1000; | 102 | const int KODayMatrix::NOSELECTION = -1000; |
103 | const int KODayMatrix::NUMDAYS = 42; | 103 | const int KODayMatrix::NUMDAYS = 42; |
104 | 104 | ||
105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) | 105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) |
106 | : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 ) | 106 | : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 ) |
107 | 107 | ||
108 | #if 0 | 108 | |
109 | KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) : | ||
110 | QFrame(parent, name) | ||
111 | #endif | ||
112 | { | 109 | { |
110 | mLastView = -1; | ||
113 | oldW = 0; | 111 | oldW = 0; |
114 | oldH = 0; | 112 | oldH = 0; |
115 | myPix.resize( 150, 120 ); | 113 | myPix.resize( 150, 120 ); |
116 | mRedrawNeeded = true; | 114 | mRedrawNeeded = true; |
117 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); | 115 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); |
118 | mPendingUpdateBeforeRepaint = false; | 116 | mPendingUpdateBeforeRepaint = false; |
119 | mouseDown = false; | 117 | mouseDown = false; |
120 | // initialize dynamic arrays | 118 | // initialize dynamic arrays |
121 | bDays.resize ( NUMDAYS ); | 119 | bDays.resize ( NUMDAYS ); |
122 | pDays.resize ( NUMDAYS ); | 120 | pDays.resize ( NUMDAYS ); |
123 | hDays.resize ( NUMDAYS ); | 121 | hDays.resize ( NUMDAYS ); |
124 | eDays.resize ( NUMDAYS ); | 122 | eDays.resize ( NUMDAYS ); |
125 | days = new QDate[NUMDAYS]; | 123 | days = new QDate[NUMDAYS]; |
126 | daylbls = new QString[NUMDAYS]; | 124 | daylbls = new QString[NUMDAYS]; |
127 | //events = new int[NUMDAYS]; | 125 | //events = new int[NUMDAYS]; |
128 | mToolTip = new DynamicTip(this); | 126 | mToolTip = new DynamicTip(this); |
129 | 127 | ||
130 | // set default values used for drawing the matrix | 128 | // set default values used for drawing the matrix |
131 | mDefaultBackColor = palette().active().base(); | 129 | mDefaultBackColor = palette().active().base(); |
132 | mDefaultTextColor = palette().active().foreground(); | 130 | mDefaultTextColor = palette().active().foreground(); |
133 | mDefaultTextColorShaded = getShadedColor(mDefaultTextColor); | 131 | mDefaultTextColorShaded = getShadedColor(mDefaultTextColor); |
134 | mHolidayColorShaded = getShadedColor(KOPrefs::instance()->mHolidayColor); | 132 | mHolidayColorShaded = getShadedColor(KOPrefs::instance()->mHolidayColor); |
135 | mSelectedDaysColor = QColor("white"); | 133 | mSelectedDaysColor = QColor("white"); |
136 | mTodayMarginWidth = 2; | 134 | mTodayMarginWidth = 2; |
@@ -223,48 +221,54 @@ void KODayMatrix::setCalendar( Calendar *cal ) | |||
223 | { | 221 | { |
224 | mCalendar = cal; | 222 | mCalendar = cal; |
225 | 223 | ||
226 | setAcceptDrops( mCalendar ); | 224 | setAcceptDrops( mCalendar ); |
227 | 225 | ||
228 | updateEvents(); | 226 | updateEvents(); |
229 | } | 227 | } |
230 | 228 | ||
231 | QColor KODayMatrix::getShadedColor(QColor color) | 229 | QColor KODayMatrix::getShadedColor(QColor color) |
232 | { | 230 | { |
233 | QColor shaded; | 231 | QColor shaded; |
234 | int h=0; | 232 | int h=0; |
235 | int s=0; | 233 | int s=0; |
236 | int v=0; | 234 | int v=0; |
237 | color.hsv(&h,&s,&v); | 235 | color.hsv(&h,&s,&v); |
238 | s = s/4; | 236 | s = s/4; |
239 | v = 192+v/4; | 237 | v = 192+v/4; |
240 | shaded.setHsv(h,s,v); | 238 | shaded.setHsv(h,s,v); |
241 | 239 | ||
242 | return shaded; | 240 | return shaded; |
243 | } | 241 | } |
244 | 242 | ||
245 | KODayMatrix::~KODayMatrix() | 243 | KODayMatrix::~KODayMatrix() |
246 | { | 244 | { |
245 | #if QT_VERSION >= 0x030000 | ||
246 | |||
247 | #else | ||
248 | delete mKODaymatrixWhatsThis; | ||
249 | #endif | ||
250 | |||
247 | // delete mKODaymatrixWhatsThis; | 251 | // delete mKODaymatrixWhatsThis; |
248 | delete [] days; | 252 | delete [] days; |
249 | delete [] daylbls; | 253 | delete [] daylbls; |
250 | //delete [] events; | 254 | //delete [] events; |
251 | delete mToolTip; | 255 | delete mToolTip; |
252 | } | 256 | } |
253 | 257 | ||
254 | /* | 258 | /* |
255 | void KODayMatrix::setStartDate(QDate start) | 259 | void KODayMatrix::setStartDate(QDate start) |
256 | { | 260 | { |
257 | updateView(start); | 261 | updateView(start); |
258 | } | 262 | } |
259 | */ | 263 | */ |
260 | 264 | ||
261 | void KODayMatrix::addSelectedDaysTo(DateList& selDays) | 265 | void KODayMatrix::addSelectedDaysTo(DateList& selDays) |
262 | { | 266 | { |
263 | 267 | ||
264 | if (mSelStart == NOSELECTION) { | 268 | if (mSelStart == NOSELECTION) { |
265 | return; | 269 | return; |
266 | } | 270 | } |
267 | 271 | ||
268 | //cope with selection being out of matrix limits at top (< 0) | 272 | //cope with selection being out of matrix limits at top (< 0) |
269 | int i0 = mSelStart; | 273 | int i0 = mSelStart; |
270 | if (i0 < 0) { | 274 | if (i0 < 0) { |