summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaitem.cpp2
-rw-r--r--korganizer/korganizer.pro2
2 files changed, 2 insertions, 2 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index df7d612..6a312b3 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -1,759 +1,759 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18*/ 18*/
19 19
20#include <qlabel.h> 20#include <qlabel.h>
21#include <qlayout.h> 21#include <qlayout.h>
22#include <qhbox.h> 22#include <qhbox.h>
23#include <qvbox.h> 23#include <qvbox.h>
24#include <qtooltip.h> 24#include <qtooltip.h>
25#include <qwhatsthis.h> 25#include <qwhatsthis.h>
26#include <qdragobject.h> 26#include <qdragobject.h>
27#include <qdrawutil.h> 27#include <qdrawutil.h>
28#include <qpainter.h> 28#include <qpainter.h>
29 29
30#include <kiconloader.h> 30#include <kiconloader.h>
31#include <kdebug.h> 31#include <kdebug.h>
32#include <kglobal.h> 32#include <kglobal.h>
33#include <klocale.h> 33#include <klocale.h>
34#ifndef DESKTOP_VERSION 34#ifndef DESKTOP_VERSION
35#include <qpe/qpeapplication.h> 35#include <qpe/qpeapplication.h>
36#define AGENDA_ICON_SIZE 5 36#define AGENDA_ICON_SIZE 5
37#else 37#else
38#define AGENDA_ICON_SIZE 7 38#define AGENDA_ICON_SIZE 7
39#endif 39#endif
40#include <libkcal/icaldrag.h> 40#include <libkcal/icaldrag.h>
41#include <libkcal/vcaldrag.h> 41#include <libkcal/vcaldrag.h>
42#include <libkcal/kincidenceformatter.h> 42#include <libkcal/kincidenceformatter.h>
43extern int globalFlagBlockAgenda; 43extern int globalFlagBlockAgenda;
44extern int globalFlagBlockAgendaItemPaint; 44extern int globalFlagBlockAgendaItemPaint;
45extern int globalFlagBlockAgendaItemUpdate; 45extern int globalFlagBlockAgendaItemUpdate;
46 46
47#include "koprefs.h" 47#include "koprefs.h"
48 48
49#include "koagendaitem.h" 49#include "koagendaitem.h"
50//#include "koagendaitem.moc" 50//#include "koagendaitem.moc"
51 51
52 52
53//-------------------------------------------------------------------------- 53//--------------------------------------------------------------------------
54 54
55QToolTipGroup *KOAgendaItem::mToolTipGroup = 0; 55QToolTipGroup *KOAgendaItem::mToolTipGroup = 0;
56 56
57//-------------------------------------------------------------------------- 57//--------------------------------------------------------------------------
58 58
59class KOAgendaItemWhatsThis :public QWhatsThis 59class KOAgendaItemWhatsThis :public QWhatsThis
60{ 60{
61public: 61public:
62 KOAgendaItemWhatsThis( KOAgendaItem* view ) : QWhatsThis( view ),_view (view) { }; 62 KOAgendaItemWhatsThis( KOAgendaItem* view ) : QWhatsThis( view ),_view (view) { };
63 63
64protected: 64protected:
65 virtual QString text( const QPoint& ) 65 virtual QString text( const QPoint& )
66 { 66 {
67 return _view->getWhatsThisText() ; 67 return _view->getWhatsThisText() ;
68 } 68 }
69private: 69private:
70 KOAgendaItem * _view; 70 KOAgendaItem * _view;
71}; 71};
72 72
73KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday, 73KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday,
74 const char *name,WFlags) : 74 const char *name,WFlags) :
75 QWidget(parent, name), mIncidence(incidence), mDate(qd) 75 QWidget(parent, name), mIncidence(incidence), mDate(qd)
76{ 76{
77#ifndef DESKTOP_VERSION 77#ifndef DESKTOP_VERSION
78 QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); 78 QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
79#endif 79#endif
80 new KOAgendaItemWhatsThis(this); 80 new KOAgendaItemWhatsThis(this);
81 int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase 81 int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase
82 setWFlags ( wflags); 82 setWFlags ( wflags);
83 mAllDay = allday; 83 mAllDay = allday;
84 init ( incidence, qd ); 84 init ( incidence, qd );
85 setMouseTracking(true); 85 setMouseTracking(true);
86 //setAcceptDrops(true); 86 //setAcceptDrops(true);
87 xPaintCoord = -1; 87 xPaintCoord = -1;
88 yPaintCoord = -1; 88 yPaintCoord = -1;
89} 89}
90QString KOAgendaItem::getWhatsThisText() 90QString KOAgendaItem::getWhatsThisText()
91{ 91{
92 if ( mIncidence ) 92 if ( mIncidence )
93 return KIncidenceFormatter::instance()->getFormattedText( mIncidence ); 93 return KIncidenceFormatter::instance()->getFormattedText( mIncidence );
94 return "KOAgendaItem::getWhatsThisText()::internal error"; 94 return "KOAgendaItem::getWhatsThisText()::internal error";
95} 95}
96void KOAgendaItem::init ( Incidence *incidence, QDate qd ) 96void KOAgendaItem::init ( Incidence *incidence, QDate qd )
97{ 97{
98 mIncidence = incidence; 98 mIncidence = incidence;
99 mDate = qd; 99 mDate = qd;
100 mFirstMultiItem = 0; 100 mFirstMultiItem = 0;
101 mNextMultiItem = 0; 101 mNextMultiItem = 0;
102 mLastMultiItem = 0; 102 mLastMultiItem = 0;
103 computeText(); 103 computeText();
104 104
105 if ( (incidence->type() == "Todo") && 105 if ( (incidence->type() == "Todo") &&
106 ( !((static_cast<Todo*>(incidence))->isCompleted()) && 106 ( !((static_cast<Todo*>(incidence))->isCompleted()) &&
107 ((static_cast<Todo*>(incidence))->dtDue().date() <= QDate::currentDate()) ) ) { 107 ((static_cast<Todo*>(incidence))->dtDue().date() <= QDate::currentDate()) ) ) {
108 if ( (static_cast<Todo*>(incidence))->dtDue() < QDateTime::currentDateTime().date()) 108 if ( (static_cast<Todo*>(incidence))->dtDue() < QDateTime::currentDateTime().date())
109 mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ; 109 mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ;
110 else 110 else
111 mBackgroundColor = KOPrefs::instance()->mTodoDueTodayColor; 111 mBackgroundColor = KOPrefs::instance()->mTodoDueTodayColor;
112 } 112 }
113 else { 113 else {
114 QStringList categories = mIncidence->categories(); 114 QStringList categories = mIncidence->categories();
115 QString cat = categories.first(); 115 QString cat = categories.first();
116 if (cat.isEmpty()) { 116 if (cat.isEmpty()) {
117 if ( (incidence->type() == "Todo") &&((static_cast<Todo*>(incidence))->isCompleted()) ) 117 if ( (incidence->type() == "Todo") &&((static_cast<Todo*>(incidence))->isCompleted()) )
118 mBackgroundColor =KOPrefs::instance()->mTodoDoneColor; 118 mBackgroundColor =KOPrefs::instance()->mTodoDoneColor;
119 else 119 else
120 mBackgroundColor =KOPrefs::instance()->mEventColor; 120 mBackgroundColor =KOPrefs::instance()->mEventColor;
121 } else { 121 } else {
122 mBackgroundColor = *KOPrefs::instance()->categoryColor(cat); 122 mBackgroundColor = *KOPrefs::instance()->categoryColor(cat);
123 if ( (incidence->type() == "Todo") &&((static_cast<Todo*>(incidence))->isCompleted()) ) { 123 if ( (incidence->type() == "Todo") &&((static_cast<Todo*>(incidence))->isCompleted()) ) {
124 if ( mBackgroundColor == KOPrefs::instance()->mEventColor ) 124 if ( mBackgroundColor == KOPrefs::instance()->mEventColor )
125 mBackgroundColor =KOPrefs::instance()->mTodoDoneColor; 125 mBackgroundColor =KOPrefs::instance()->mTodoDoneColor;
126 } 126 }
127 } 127 }
128 128
129 } 129 }
130 mColorGroup = QColorGroup( mBackgroundColor.light(), 130 mColorGroup = QColorGroup( mBackgroundColor.light(),
131 mBackgroundColor.dark(),mBackgroundColor.light(), 131 mBackgroundColor.dark(),mBackgroundColor.light(),
132 mBackgroundColor.dark(),mBackgroundColor, black, mBackgroundColor) ; 132 mBackgroundColor.dark(),mBackgroundColor, black, mBackgroundColor) ;
133 setBackgroundColor( mBackgroundColor ); 133 setBackgroundColor( mBackgroundColor );
134 134
135 setCellXY(0,0,1); 135 setCellXY(0,0,1);
136 setCellXWidth(0); 136 setCellXWidth(0);
137 setSubCell(0); 137 setSubCell(0);
138 setSubCells(1); 138 setSubCells(1);
139 setMultiItem(0,0,0); 139 setMultiItem(0,0,0);
140 startMove(); 140 startMove();
141 mSelected = true; 141 mSelected = true;
142 select(false); 142 select(false);
143 QFontMetrics fontinf(KOPrefs::instance()->mAgendaViewFont); 143 QFontMetrics fontinf(KOPrefs::instance()->mAgendaViewFont);
144 mFontPixelSize = fontinf.height();; 144 mFontPixelSize = fontinf.height();;
145 hide(); 145 hide();
146 xPaintCoord = -1; 146 xPaintCoord = -1;
147 yPaintCoord = -1; 147 yPaintCoord = -1;
148} 148}
149 149
150 150
151KOAgendaItem::~KOAgendaItem() 151KOAgendaItem::~KOAgendaItem()
152{ 152{
153 // qDebug("deleteKOAgendaItem::~KOAgendaItem( "); 153 // qDebug("deleteKOAgendaItem::~KOAgendaItem( ");
154 154
155} 155}
156 156
157void KOAgendaItem::recreateIncidence() 157void KOAgendaItem::recreateIncidence()
158{ 158{
159#if 0 159#if 0
160 Incidence* newInc = mIncidence->clone(); 160 Incidence* newInc = mIncidence->clone();
161 newInc->recreate(); 161 newInc->recreate();
162 if ( mIncidence->doesRecur() ) { 162 if ( mIncidence->doesRecur() ) {
163 mIncidence->addExDate( mDate ); 163 mIncidence->addExDate( mDate );
164 newInc->recurrence()->unsetRecurs(); 164 newInc->recurrence()->unsetRecurs();
165 int len = mIncidence->dtStart().secsTo( ((Event*)mIncidence)->dtEnd()); 165 int len = mIncidence->dtStart().secsTo( ((Event*)mIncidence)->dtEnd());
166 QTime tim = mIncidence->dtStart().time(); 166 QTime tim = mIncidence->dtStart().time();
167 newInc->setDtStart( QDateTime(mDate, tim) ); 167 newInc->setDtStart( QDateTime(mDate, tim) );
168 ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) ); 168 ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) );
169 } 169 }
170#endif 170#endif
171 mIncidence = mIncidence->recreateCloneException( mDate ); 171 mIncidence = mIncidence->recreateCloneException( mDate );
172} 172}
173bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout) 173bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
174{ 174{
175 int size = AGENDA_ICON_SIZE; 175 int size = AGENDA_ICON_SIZE;
176 176
177 int yOff = 0; 177 int yOff = 0;
178 int xOff = 0; 178 int xOff = 0;
179 int x = pos().x() +3; 179 int x = pos().x() +3;
180 int y; 180 int y;
181 if ( mAllDay ) 181 if ( mAllDay )
182 y = pos().y()+3; 182 y = pos().y()+3;
183 else 183 else
184 y = mCellYTop * ( height() / cellHeight() ) +3; 184 y = mCellYTop * ( height() / cellHeight() ) +3;
185 if (mIncidence->cancelled()) { 185 if (mIncidence->cancelled()) {
186 int xpos = xOff*( 1 +AGENDA_ICON_SIZE )+x; 186 int xpos = xOff*( 1 +AGENDA_ICON_SIZE )+x;
187 int ypos = yOff*( 1 +AGENDA_ICON_SIZE)+y; 187 int ypos = yOff*( 1 +AGENDA_ICON_SIZE)+y;
188 p->drawLine( xpos, ypos, xpos+AGENDA_ICON_SIZE-1, ypos+AGENDA_ICON_SIZE-1 ); 188 p->drawLine( xpos, ypos, xpos+AGENDA_ICON_SIZE-1, ypos+AGENDA_ICON_SIZE-1 );
189 p->drawLine( xpos, ypos+AGENDA_ICON_SIZE-1, xpos+AGENDA_ICON_SIZE-1, ypos ); 189 p->drawLine( xpos, ypos+AGENDA_ICON_SIZE-1, xpos+AGENDA_ICON_SIZE-1, ypos );
190 if ( horLayout ) 190 if ( horLayout )
191 ++xOff; 191 ++xOff;
192 else 192 else
193 ++yOff; 193 ++yOff;
194 } 194 }
195 if (mIncidence->isAlarmEnabled()) { 195 if (mIncidence->isAlarmEnabled()) {
196 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, red ); 196 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, red );
197 if ( horLayout ) 197 if ( horLayout )
198 ++xOff; 198 ++xOff;
199 else 199 else
200 ++yOff; 200 ++yOff;
201 } 201 }
202 if (mIncidence->recurrence()->doesRecur()) { 202 if (mIncidence->recurrence()->doesRecur()) {
203 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, blue ); 203 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, blue );
204 if ( horLayout ) 204 if ( horLayout )
205 ++xOff; 205 ++xOff;
206 else 206 else
207 ++yOff; 207 ++yOff;
208 } 208 }
209 if (mIncidence->description().length() > 0) { 209 if (mIncidence->description().length() > 0) {
210 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkGreen ); 210 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkGreen );
211 if ( horLayout ) 211 if ( horLayout )
212 ++xOff; 212 ++xOff;
213 else 213 else
214 ++yOff; 214 ++yOff;
215 } 215 }
216 if (mIncidence->isReadOnly()) { 216 if (mIncidence->isReadOnly()) {
217 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, white ); 217 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, white );
218 if ( horLayout ) 218 if ( horLayout )
219 ++xOff; 219 ++xOff;
220 else 220 else
221 ++yOff; 221 ++yOff;
222 } 222 }
223 223
224 if (mIncidence->attendeeCount()>0) { 224 if (mIncidence->attendeeCount()>0) {
225 225
226 if (mIncidence->organizer() == KOPrefs::instance()->email()) { 226 if (mIncidence->organizer() == KOPrefs::instance()->email()) {
227 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, black ); 227 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, black );
228 if ( horLayout ) 228 if ( horLayout )
229 ++xOff; 229 ++xOff;
230 else 230 else
231 ++yOff; 231 ++yOff;
232 } else { 232 } else {
233 Attendee *me = mIncidence->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email()); 233 Attendee *me = mIncidence->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email());
234 if (me!=0) { 234 if (me!=0) {
235 235
236 236
237 } else { 237 } else {
238 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, yellow ); 238 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, yellow );
239 if ( horLayout ) 239 if ( horLayout )
240 ++xOff; 240 ++xOff;
241 else 241 else
242 ++yOff; 242 ++yOff;
243 243
244 } 244 }
245 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkYellow ); 245 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkYellow );
246 if ( horLayout ) 246 if ( horLayout )
247 ++xOff; 247 ++xOff;
248 else 248 else
249 ++yOff; 249 ++yOff;
250 250
251 } 251 }
252 252
253 } 253 }
254 return ( yOff || xOff ); 254 return ( yOff || xOff );
255} 255}
256 256
257 257
258void KOAgendaItem::select(bool selected) 258void KOAgendaItem::select(bool selected)
259{ 259{
260 //qDebug("select %d %d",firstMultiItem(), nextMultiItem() ); 260 //qDebug("select %d %d",firstMultiItem(), nextMultiItem() );
261 if (mSelected == selected) return; 261 if (mSelected == selected) return;
262 mSelected = selected; 262 mSelected = selected;
263 if ( ! isVisible() ) 263 if ( ! isVisible() )
264 return; 264 return;
265 if ( firstMultiItem() ) 265 if ( firstMultiItem() )
266 firstMultiItem()->select( selected ); 266 firstMultiItem()->select( selected );
267 if ( !firstMultiItem() && nextMultiItem() ) { 267 if ( !firstMultiItem() && nextMultiItem() ) {
268 KOAgendaItem * placeItem = nextMultiItem(); 268 KOAgendaItem * placeItem = nextMultiItem();
269 while ( placeItem ) { 269 while ( placeItem ) {
270 placeItem->select( selected ); 270 placeItem->select( selected );
271 placeItem = placeItem->nextMultiItem(); 271 placeItem = placeItem->nextMultiItem();
272 } 272 }
273 } 273 }
274 globalFlagBlockAgendaItemUpdate = 0; 274 globalFlagBlockAgendaItemUpdate = 0;
275 paintMe( selected ); 275 paintMe( selected );
276 globalFlagBlockAgendaItemUpdate = 1; 276 globalFlagBlockAgendaItemUpdate = 1;
277 repaint( false ); 277 repaint( false );
278} 278}
279 279
280 280
281/* 281/*
282 The eventFilter has to filter the mouse events of the agenda item childs. The 282 The eventFilter has to filter the mouse events of the agenda item childs. The
283 events are fed into the event handling method of KOAgendaItem. This allows the 283 events are fed into the event handling method of KOAgendaItem. This allows the
284 KOAgenda to handle the KOAgendaItems by using an eventFilter. 284 KOAgenda to handle the KOAgendaItems by using an eventFilter.
285*/ 285*/
286bool KOAgendaItem::eventFilter ( QObject *object, QEvent *e ) 286bool KOAgendaItem::eventFilter ( QObject *object, QEvent *e )
287{ 287{
288 if (e->type() == QEvent::MouseButtonPress || 288 if (e->type() == QEvent::MouseButtonPress ||
289 e->type() == QEvent::MouseButtonDblClick || 289 e->type() == QEvent::MouseButtonDblClick ||
290 e->type() == QEvent::MouseButtonRelease || 290 e->type() == QEvent::MouseButtonRelease ||
291 e->type() == QEvent::MouseMove) { 291 e->type() == QEvent::MouseMove) {
292 QMouseEvent *me = (QMouseEvent *)e; 292 QMouseEvent *me = (QMouseEvent *)e;
293 QPoint itemPos = this->mapFromGlobal(((QWidget *)object)-> 293 QPoint itemPos = this->mapFromGlobal(((QWidget *)object)->
294 mapToGlobal(me->pos())); 294 mapToGlobal(me->pos()));
295 QMouseEvent returnEvent (e->type(),itemPos,me->button(),me->state()); 295 QMouseEvent returnEvent (e->type(),itemPos,me->button(),me->state());
296 return event(&returnEvent); 296 return event(&returnEvent);
297 } else { 297 } else {
298 return false; 298 return false;
299 } 299 }
300} 300}
301void KOAgendaItem::repaintMe( ) 301void KOAgendaItem::repaintMe( )
302{ 302{
303 paintMe ( mSelected ); 303 paintMe ( mSelected );
304} 304}
305void KOAgendaItem::paintMe( bool selected, QPainter* paint ) 305void KOAgendaItem::paintMe( bool selected, QPainter* paint )
306{ 306{
307 if ( globalFlagBlockAgendaItemUpdate && ! selected) 307 if ( globalFlagBlockAgendaItemUpdate && ! selected)
308 return; 308 return;
309 QPainter pa; 309 QPainter pa;
310 310
311 if ( mSelected ) { 311 if ( mSelected ) {
312 pa.begin( paintPixSel() ); 312 pa.begin( paintPixSel() );
313 } else { 313 } else {
314 if ( mAllDay ) 314 if ( mAllDay )
315 pa.begin( paintPixAllday() ); 315 pa.begin( paintPixAllday() );
316 else 316 else
317 pa.begin( paintPix() ); 317 pa.begin( paintPix() );
318 } 318 }
319 int x, yy, w, h; 319 int x, yy, w, h;
320 float nfh; 320 float nfh = 7.0;
321 x = pos().x(); w = width(); h = height (); 321 x = pos().x(); w = width(); h = height ();
322 if ( mAllDay ) 322 if ( mAllDay )
323 yy = y(); 323 yy = y();
324 else 324 else
325 yy = mCellYTop * ( height() / cellHeight() ); 325 yy = mCellYTop * ( height() / cellHeight() );
326 xPaintCoord= x; 326 xPaintCoord= x;
327 yPaintCoord = yy; 327 yPaintCoord = yy;
328 wPaintCoord = width(); 328 wPaintCoord = width();
329 hPaintCoord = height(); 329 hPaintCoord = height();
330 //qDebug("paintMe %s %d %d %d %d",incidence()->summary().latin1(), x, yy, width(), height()); 330 //qDebug("paintMe %s %d %d %d %d",incidence()->summary().latin1(), x, yy, width(), height());
331 if ( paint == 0 ) 331 if ( paint == 0 )
332 paint = &pa; 332 paint = &pa;
333 bool horLayout = ( w < h ); 333 bool horLayout = ( w < h );
334 int maxhei = mFontPixelSize+4; 334 int maxhei = mFontPixelSize+4;
335 if ( horLayout ) 335 if ( horLayout )
336 maxhei += AGENDA_ICON_SIZE -4; 336 maxhei += AGENDA_ICON_SIZE -4;
337 bool small = ( h < maxhei ); 337 bool small = ( h < maxhei );
338 if ( ! small ) 338 if ( ! small )
339 paint->setFont(KOPrefs::instance()->mAgendaViewFont); 339 paint->setFont(KOPrefs::instance()->mAgendaViewFont);
340 else { 340 else {
341 QFont f = KOPrefs::instance()->mAgendaViewFont; 341 QFont f = KOPrefs::instance()->mAgendaViewFont;
342 f.setBold( false ); 342 f.setBold( false );
343 int fh = f.pointSize(); 343 int fh = f.pointSize();
344 nfh = (((float)height())/(float)(mFontPixelSize+4))*fh; 344 nfh = (((float)height())/(float)(mFontPixelSize+4))*fh;
345 if ( nfh < 6 ) 345 if ( nfh < 6 )
346 nfh = 6; 346 nfh = 6;
347 f.setPointSize( nfh ); 347 f.setPointSize( nfh );
348 paint->setFont(f); 348 paint->setFont(f);
349 } 349 }
350 paint->fillRect ( x, yy, w, h, mBackgroundColor ); 350 paint->fillRect ( x, yy, w, h, mBackgroundColor );
351 static const QPixmap completedPxmp = SmallIcon("greenhook16"); 351 static const QPixmap completedPxmp = SmallIcon("greenhook16");
352 static const QPixmap overduePxmp = SmallIcon("redcross16"); 352 static const QPixmap overduePxmp = SmallIcon("redcross16");
353 if ( mIncidence->type() == "Todo" ) { 353 if ( mIncidence->type() == "Todo" ) {
354 Todo* tempTodo = static_cast<Todo*>(mIncidence); 354 Todo* tempTodo = static_cast<Todo*>(mIncidence);
355 int xx = pos().x()+(width()-completedPxmp.width()-3 ); 355 int xx = pos().x()+(width()-completedPxmp.width()-3 );
356 int yyy = yy+3; 356 int yyy = yy+3;
357 if ( tempTodo->isCompleted() ) 357 if ( tempTodo->isCompleted() )
358 paint->drawPixmap ( xx, yyy, completedPxmp ); 358 paint->drawPixmap ( xx, yyy, completedPxmp );
359 else { 359 else {
360 paint->drawPixmap ( xx, yyy, overduePxmp ); 360 paint->drawPixmap ( xx, yyy, overduePxmp );
361 361
362 } 362 }
363 } 363 }
364 bool addIcon = false; 364 bool addIcon = false;
365 if ( ! small || w > 3 * h || h > 3* w ) 365 if ( ! small || w > 3 * h || h > 3* w )
366 addIcon = updateIcons( paint, horLayout ); 366 addIcon = updateIcons( paint, horLayout );
367 367
368 qDrawShadePanel (paint, x, yy, w, h, mColorGroup, selected , 2, 0); 368 qDrawShadePanel (paint, x, yy, w, h, mColorGroup, selected , 2, 0);
369 //qDebug("draw rect %d %d %d %d ",x, yy, w, h ); 369 //qDebug("draw rect %d %d %d %d ",x, yy, w, h );
370 if ( ! small ) { 370 if ( ! small ) {
371 x += 3; yy += 3;w -= 6; h-= 5; 371 x += 3; yy += 3;w -= 6; h-= 5;
372 } else { 372 } else {
373 x += 2; yy += 1;w -= 4; h-= 4; 373 x += 2; yy += 1;w -= 4; h-= 4;
374 if ( nfh < 6.01 ) { 374 if ( nfh < 6.01 ) {
375 yy -= 2; 375 yy -= 2;
376 h += 4; 376 h += 4;
377 } 377 }
378 else 378 else
379 if ( nfh < h -2 ) 379 if ( nfh < h -2 )
380 ++yy; 380 ++yy;
381 } 381 }
382 int align; 382 int align;
383#ifndef DESKTOP_VERSION 383#ifndef DESKTOP_VERSION
384 align = ( AlignLeft|WordBreak|AlignTop); 384 align = ( AlignLeft|WordBreak|AlignTop);
385#else 385#else
386 align = ( AlignLeft|BreakAnywhere|WordBreak|AlignTop); 386 align = ( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
387#endif 387#endif
388 if ( addIcon ) { 388 if ( addIcon ) {
389 if ( ! horLayout ) { 389 if ( ! horLayout ) {
390 x += AGENDA_ICON_SIZE+3; 390 x += AGENDA_ICON_SIZE+3;
391 w -= (AGENDA_ICON_SIZE+3); 391 w -= (AGENDA_ICON_SIZE+3);
392 } 392 }
393 else { 393 else {
394 yy+= AGENDA_ICON_SIZE+2; 394 yy+= AGENDA_ICON_SIZE+2;
395 h -=(AGENDA_ICON_SIZE+3); 395 h -=(AGENDA_ICON_SIZE+3);
396 } 396 }
397 } 397 }
398 int colsum = mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue(); 398 int colsum = mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue();
399 if ( colsum < 250 ) 399 if ( colsum < 250 )
400 paint->setPen ( white); 400 paint->setPen ( white);
401 if ( x < 0 ) { 401 if ( x < 0 ) {
402 w = w+x-3; 402 w = w+x-3;
403 x = 3; 403 x = 3;
404 if ( w > parentWidget()->width() ){ 404 if ( w > parentWidget()->width() ){
405 w = parentWidget()->width() - 6; 405 w = parentWidget()->width() - 6;
406#ifndef DESKTOP_VERSION 406#ifndef DESKTOP_VERSION
407 align = ( AlignCenter|WordBreak); 407 align = ( AlignCenter|WordBreak);
408#else 408#else
409 align = ( AlignCenter|BreakAnywhere|WordBreak); 409 align = ( AlignCenter|BreakAnywhere|WordBreak);
410#endif 410#endif
411 411
412 } 412 }
413 } 413 }
414 QRect dr; 414 QRect dr;
415 paint->drawText ( x, yy, w, h, align, mDisplayedText, -1, &dr ); 415 paint->drawText ( x, yy, w, h, align, mDisplayedText, -1, &dr );
416 if ( mIncidence->cancelled() ){ 416 if ( mIncidence->cancelled() ){
417 if ( ! small ) { 417 if ( ! small ) {
418 QFontMetrics fm ( paint->font() ); 418 QFontMetrics fm ( paint->font() );
419 paint->drawLine(dr.left(), yy+fm.height()/2, dr.right()-2, yy+fm.height()/2); 419 paint->drawLine(dr.left(), yy+fm.height()/2, dr.right()-2, yy+fm.height()/2);
420 } 420 }
421 421
422 } 422 }
423 pa.end(); 423 pa.end();
424 424
425} 425}
426void KOAgendaItem::resizePixmap( int w , int h ) 426void KOAgendaItem::resizePixmap( int w , int h )
427{ 427{
428 paintPix()->resize( w, h ); 428 paintPix()->resize( w, h );
429 paintPixSel()->resize( w, h ); 429 paintPixSel()->resize( w, h );
430 430
431} 431}
432QPixmap * KOAgendaItem::paintPix() 432QPixmap * KOAgendaItem::paintPix()
433{ 433{
434 static QPixmap* mPaintPix = 0; 434 static QPixmap* mPaintPix = 0;
435 if ( ! mPaintPix ) 435 if ( ! mPaintPix )
436 mPaintPix = new QPixmap(1,1); 436 mPaintPix = new QPixmap(1,1);
437 return mPaintPix ; 437 return mPaintPix ;
438} 438}
439QPixmap * KOAgendaItem::paintPixAllday() 439QPixmap * KOAgendaItem::paintPixAllday()
440{ 440{
441 static QPixmap* mPaintPixA = 0; 441 static QPixmap* mPaintPixA = 0;
442 if ( ! mPaintPixA ) 442 if ( ! mPaintPixA )
443 mPaintPixA = new QPixmap(1,1); 443 mPaintPixA = new QPixmap(1,1);
444 return mPaintPixA ; 444 return mPaintPixA ;
445} 445}
446QPixmap * KOAgendaItem::paintPixSel() 446QPixmap * KOAgendaItem::paintPixSel()
447{ 447{
448 static QPixmap* mPaintPixSel = 0; 448 static QPixmap* mPaintPixSel = 0;
449 if ( ! mPaintPixSel ) 449 if ( ! mPaintPixSel )
450 mPaintPixSel = new QPixmap(1,1); 450 mPaintPixSel = new QPixmap(1,1);
451 return mPaintPixSel ; 451 return mPaintPixSel ;
452} 452}
453void KOAgendaItem::paintEvent ( QPaintEvent *e ) 453void KOAgendaItem::paintEvent ( QPaintEvent *e )
454{ 454{
455 455
456 if ( globalFlagBlockAgendaItemPaint ) 456 if ( globalFlagBlockAgendaItemPaint )
457 return; 457 return;
458 if ( globalFlagBlockAgenda > 0 && globalFlagBlockAgenda < 5 ) 458 if ( globalFlagBlockAgenda > 0 && globalFlagBlockAgenda < 5 )
459 return; 459 return;
460 int yy; 460 int yy;
461 if ( mAllDay ) 461 if ( mAllDay )
462 yy = y(); 462 yy = y();
463 else 463 else
464 yy = mCellYTop * ( height() / cellHeight() ); 464 yy = mCellYTop * ( height() / cellHeight() );
465 int xx = x(); 465 int xx = x();
466 if ( xPaintCoord != xx || yPaintCoord != yy || 466 if ( xPaintCoord != xx || yPaintCoord != yy ||
467 wPaintCoord != width() || hPaintCoord != height()) { 467 wPaintCoord != width() || hPaintCoord != height()) {
468 xPaintCoord= xx; 468 xPaintCoord= xx;
469 yPaintCoord = yy; 469 yPaintCoord = yy;
470 wPaintCoord = width(); 470 wPaintCoord = width();
471 hPaintCoord = height(); 471 hPaintCoord = height();
472 globalFlagBlockAgendaItemUpdate = 0; 472 globalFlagBlockAgendaItemUpdate = 0;
473 paintMe( mSelected ); 473 paintMe( mSelected );
474 //qDebug("calling paintMe "); 474 //qDebug("calling paintMe ");
475 globalFlagBlockAgendaItemUpdate = 1; 475 globalFlagBlockAgendaItemUpdate = 1;
476 } 476 }
477 int rx, ry, rw, rh; 477 int rx, ry, rw, rh;
478 rx = e->rect().x(); 478 rx = e->rect().x();
479 ry = e->rect().y(); 479 ry = e->rect().y();
480 rw = e->rect().width(); 480 rw = e->rect().width();
481 rh = e->rect().height(); 481 rh = e->rect().height();
482 //qDebug(" paintevent %s %d %d %d %d", mIncidence->summary().latin1(), x(), yy, width(), height()); 482 //qDebug(" paintevent %s %d %d %d %d", mIncidence->summary().latin1(), x(), yy, width(), height());
483 483
484 QPixmap* paintFrom ; 484 QPixmap* paintFrom ;
485 if ( mSelected ) { 485 if ( mSelected ) {
486 paintFrom = paintPixSel(); 486 paintFrom = paintPixSel();
487 } else { 487 } else {
488 if ( mAllDay ) 488 if ( mAllDay )
489 paintFrom = paintPixAllday(); 489 paintFrom = paintPixAllday();
490 else 490 else
491 paintFrom = paintPix(); 491 paintFrom = paintPix();
492 } 492 }
493 bitBlt (this, rx, ry, paintFrom, x()+rx ,yPaintCoord+ry, rw, rh ,CopyROP); 493 bitBlt (this, rx, ry, paintFrom, x()+rx ,yPaintCoord+ry, rw, rh ,CopyROP);
494} 494}
495void KOAgendaItem::computeText() 495void KOAgendaItem::computeText()
496{ 496{
497 497
498 mDisplayedText = mIncidence->summary(); 498 mDisplayedText = mIncidence->summary();
499 if ( (mIncidence->type() == "Todo") ) { 499 if ( (mIncidence->type() == "Todo") ) {
500 if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) { 500 if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) {
501 if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() ) 501 if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() )
502 mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")"; 502 mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")";
503 else if ( !(mIncidence->doesFloat())) 503 else if ( !(mIncidence->doesFloat()))
504 mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")"; 504 mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")";
505 } 505 }
506 } else { 506 } else {
507 if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda) 507 if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda)
508 mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ; 508 mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ;
509 509
510 if ( mAllDay ) { 510 if ( mAllDay ) {
511 if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) { 511 if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) {
512 mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) ; 512 mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) ;
513 } 513 }
514 } 514 }
515 515
516 } 516 }
517 517
518 if ( !mIncidence->location().isEmpty() ) { 518 if ( !mIncidence->location().isEmpty() ) {
519 if ( mAllDay ) 519 if ( mAllDay )
520 mDisplayedText += " ("; 520 mDisplayedText += " (";
521 else 521 else
522 mDisplayedText += "\n("; 522 mDisplayedText += "\n(";
523 mDisplayedText += mIncidence->location() +")"; 523 mDisplayedText += mIncidence->location() +")";
524 } 524 }
525 525
526 QString tipText = mIncidence->summary(); 526 QString tipText = mIncidence->summary();
527 if ( !mIncidence->doesFloat() ) { 527 if ( !mIncidence->doesFloat() ) {
528 if ( mIncidence->type() == "Event" ) { 528 if ( mIncidence->type() == "Event" ) {
529 if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) { 529 if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) {
530 tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr(); 530 tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr();
531 tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr(); 531 tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr();
532 } 532 }
533 else { 533 else {
534 tipText += "\n"+i18n("Time: ")+mIncidence->dtStartTimeStr(); 534 tipText += "\n"+i18n("Time: ")+mIncidence->dtStartTimeStr();
535 tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr(); 535 tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr();
536 } 536 }
537 } 537 }
538 else if ( mIncidence->type() == "Todo" ) { 538 else if ( mIncidence->type() == "Todo" ) {
539 if (mIncidence->hasStartDate()) 539 if (mIncidence->hasStartDate())
540 tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartStr(); 540 tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartStr();
541 if (((Todo*)mIncidence)->hasDueDate()) 541 if (((Todo*)mIncidence)->hasDueDate())
542 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueStr(); 542 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueStr();
543 } 543 }
544 } else if ( mIncidence->type() == "Todo" ) { 544 } else if ( mIncidence->type() == "Todo" ) {
545 if (mIncidence->hasStartDate()) 545 if (mIncidence->hasStartDate())
546 tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartDateStr(); 546 tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartDateStr();
547 if (((Todo*)mIncidence)->hasDueDate()) 547 if (((Todo*)mIncidence)->hasDueDate())
548 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueDateStr(); 548 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueDateStr();
549 } 549 }
550 550
551 if (!mIncidence->location().isEmpty()) { 551 if (!mIncidence->location().isEmpty()) {
552 tipText += "\n"+i18n("Location: ")+mIncidence->location(); 552 tipText += "\n"+i18n("Location: ")+mIncidence->location();
553 } 553 }
554 QToolTip::add(this,tipText,toolTipGroup(),""); 554 QToolTip::add(this,tipText,toolTipGroup(),"");
555 555
556} 556}
557void KOAgendaItem::updateItem() 557void KOAgendaItem::updateItem()
558{ 558{
559 computeText(); 559 computeText();
560 560
561 //qDebug("KOAgendaItem:: updateItem() %s %d %d ",incidence()->summary().latin1(), x(), y()); 561 //qDebug("KOAgendaItem:: updateItem() %s %d %d ",incidence()->summary().latin1(), x(), y());
562 paintMe( mSelected ); 562 paintMe( mSelected );
563 repaint( false); 563 repaint( false);
564} 564}
565 565
566void KOAgendaItem::resizeEvent ( QResizeEvent *ev ) 566void KOAgendaItem::resizeEvent ( QResizeEvent *ev )
567{ 567{
568 //qDebug("KOAgendaItem::resizeEvent %s ", mIncidence->summary().latin1()); 568 //qDebug("KOAgendaItem::resizeEvent %s ", mIncidence->summary().latin1());
569 paintMe( mSelected ); 569 paintMe( mSelected );
570 repaint( false ); 570 repaint( false );
571} 571}
572 572
573/* 573/*
574 Return height of item in units of agenda cells 574 Return height of item in units of agenda cells
575*/ 575*/
576int KOAgendaItem::cellHeight() 576int KOAgendaItem::cellHeight()
577{ 577{
578 int ret = mCellYBottom - mCellYTop + 1; 578 int ret = mCellYBottom - mCellYTop + 1;
579 if ( ret <= 0 ) { 579 if ( ret <= 0 ) {
580 ret = 1; 580 ret = 1;
581 mCellYBottom = 0; 581 mCellYBottom = 0;
582 mCellYTop = 0; 582 mCellYTop = 0;
583 } 583 }
584 return ret; 584 return ret;
585} 585}
586 586
587/* 587/*
588 Return height of item in units of agenda cells 588 Return height of item in units of agenda cells
589*/ 589*/
590int KOAgendaItem::cellWidth() 590int KOAgendaItem::cellWidth()
591{ 591{
592 return mCellXWidth - mCellX + 1; 592 return mCellXWidth - mCellX + 1;
593} 593}
594 594
595void KOAgendaItem::setItemDate(QDate qd) 595void KOAgendaItem::setItemDate(QDate qd)
596{ 596{
597 mDate = qd; 597 mDate = qd;
598} 598}
599 599
600void KOAgendaItem::setCellXY(int X, int YTop, int YBottom) 600void KOAgendaItem::setCellXY(int X, int YTop, int YBottom)
601{ 601{
602 mCellX = X; 602 mCellX = X;
603 mCellYTop = YTop; 603 mCellYTop = YTop;
604 mCellYBottom = YBottom; 604 mCellYBottom = YBottom;
605} 605}
606 606
607void KOAgendaItem::setCellXWidth(int xwidth) 607void KOAgendaItem::setCellXWidth(int xwidth)
608{ 608{
609 mCellXWidth = xwidth; 609 mCellXWidth = xwidth;
610} 610}
611 611
612void KOAgendaItem::setCellX(int XLeft, int XRight) 612void KOAgendaItem::setCellX(int XLeft, int XRight)
613{ 613{
614 mCellX = XLeft; 614 mCellX = XLeft;
615 mCellXWidth = XRight; 615 mCellXWidth = XRight;
616} 616}
617 617
618void KOAgendaItem::setCellY(int YTop, int YBottom) 618void KOAgendaItem::setCellY(int YTop, int YBottom)
619{ 619{
620 mCellYTop = YTop; 620 mCellYTop = YTop;
621 mCellYBottom = YBottom; 621 mCellYBottom = YBottom;
622} 622}
623 623
624void KOAgendaItem::setSubCell(int subCell) 624void KOAgendaItem::setSubCell(int subCell)
625{ 625{
626 mSubCell = subCell; 626 mSubCell = subCell;
627} 627}
628 628
629void KOAgendaItem::setSubCells(int subCells) 629void KOAgendaItem::setSubCells(int subCells)
630{ 630{
631 mSubCells = subCells; 631 mSubCells = subCells;
632} 632}
633 633
634void KOAgendaItem::setMultiItem(KOAgendaItem *first,KOAgendaItem *next, 634void KOAgendaItem::setMultiItem(KOAgendaItem *first,KOAgendaItem *next,
635 KOAgendaItem *last) 635 KOAgendaItem *last)
636{ 636{
637 mFirstMultiItem = first; 637 mFirstMultiItem = first;
638 mNextMultiItem = next; 638 mNextMultiItem = next;
639 mLastMultiItem = last; 639 mLastMultiItem = last;
640} 640}
641 641
642void KOAgendaItem::startMove() 642void KOAgendaItem::startMove()
643{ 643{
644 mStartCellX = mCellX; 644 mStartCellX = mCellX;
645 mStartCellXWidth = mCellXWidth; 645 mStartCellXWidth = mCellXWidth;
646 mStartCellYTop = mCellYTop; 646 mStartCellYTop = mCellYTop;
647 mStartCellYBottom = mCellYBottom; 647 mStartCellYBottom = mCellYBottom;
648} 648}
649 649
650void KOAgendaItem::resetMove() 650void KOAgendaItem::resetMove()
651{ 651{
652 mCellX = mStartCellX; 652 mCellX = mStartCellX;
653 mCellXWidth = mStartCellXWidth; 653 mCellXWidth = mStartCellXWidth;
654 mCellYTop = mStartCellYTop; 654 mCellYTop = mStartCellYTop;
655 mCellYBottom = mStartCellYBottom; 655 mCellYBottom = mStartCellYBottom;
656} 656}
657 657
658void KOAgendaItem::moveRelative(int dx, int dy) 658void KOAgendaItem::moveRelative(int dx, int dy)
659{ 659{
660 int newX = cellX() + dx; 660 int newX = cellX() + dx;
661 int newXWidth = cellXWidth() + dx; 661 int newXWidth = cellXWidth() + dx;
662 int newYTop = cellYTop() + dy; 662 int newYTop = cellYTop() + dy;
663 int newYBottom = cellYBottom() + dy; 663 int newYBottom = cellYBottom() + dy;
664 setCellXY(newX,newYTop,newYBottom); 664 setCellXY(newX,newYTop,newYBottom);
665 setCellXWidth(newXWidth); 665 setCellXWidth(newXWidth);
666} 666}
667 667
668void KOAgendaItem::expandTop(int dy) 668void KOAgendaItem::expandTop(int dy)
669{ 669{
670 int newYTop = cellYTop() + dy; 670 int newYTop = cellYTop() + dy;
671 int newYBottom = cellYBottom(); 671 int newYBottom = cellYBottom();
672 if (newYTop > newYBottom) newYTop = newYBottom; 672 if (newYTop > newYBottom) newYTop = newYBottom;
673 setCellY(newYTop, newYBottom); 673 setCellY(newYTop, newYBottom);
674} 674}
675 675
676void KOAgendaItem::expandBottom(int dy) 676void KOAgendaItem::expandBottom(int dy)
677{ 677{
678 int newYTop = cellYTop(); 678 int newYTop = cellYTop();
679 int newYBottom = cellYBottom() + dy; 679 int newYBottom = cellYBottom() + dy;
680 if (newYBottom < newYTop) newYBottom = newYTop; 680 if (newYBottom < newYTop) newYBottom = newYTop;
681 setCellY(newYTop, newYBottom); 681 setCellY(newYTop, newYBottom);
682} 682}
683 683
684void KOAgendaItem::expandLeft(int dx) 684void KOAgendaItem::expandLeft(int dx)
685{ 685{
686 int newX = cellX() + dx; 686 int newX = cellX() + dx;
687 int newXWidth = cellXWidth(); 687 int newXWidth = cellXWidth();
688 if (newX > newXWidth) newX = newXWidth; 688 if (newX > newXWidth) newX = newXWidth;
689 setCellX(newX,newXWidth); 689 setCellX(newX,newXWidth);
690} 690}
691 691
692void KOAgendaItem::expandRight(int dx) 692void KOAgendaItem::expandRight(int dx)
693{ 693{
694 int newX = cellX(); 694 int newX = cellX();
695 int newXWidth = cellXWidth() + dx; 695 int newXWidth = cellXWidth() + dx;
696 if (newXWidth < newX) newXWidth = newX; 696 if (newXWidth < newX) newXWidth = newX;
697 setCellX(newX,newXWidth); 697 setCellX(newX,newXWidth);
698} 698}
699 699
700QToolTipGroup *KOAgendaItem::toolTipGroup() 700QToolTipGroup *KOAgendaItem::toolTipGroup()
701{ 701{
702 if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0); 702 if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
703 return mToolTipGroup; 703 return mToolTipGroup;
704} 704}
705 705
706void KOAgendaItem::dragEnterEvent( QDragEnterEvent *e ) 706void KOAgendaItem::dragEnterEvent( QDragEnterEvent *e )
707{ 707{
708#ifndef KORG_NODND 708#ifndef KORG_NODND
709 if ( ICalDrag::canDecode( e ) || VCalDrag::canDecode( e ) || 709 if ( ICalDrag::canDecode( e ) || VCalDrag::canDecode( e ) ||
710 !QTextDrag::canDecode( e ) ) { 710 !QTextDrag::canDecode( e ) ) {
711 e->ignore(); 711 e->ignore();
712 return; 712 return;
713 } 713 }
714 e->accept(); 714 e->accept();
715#endif 715#endif
716} 716}
717 717
718void KOAgendaItem::dropEvent( QDropEvent *e ) 718void KOAgendaItem::dropEvent( QDropEvent *e )
719{ 719{
720#ifndef KORG_NODND 720#ifndef KORG_NODND
721 QString text; 721 QString text;
722 if(QTextDrag::decode(e,text)) 722 if(QTextDrag::decode(e,text))
723 { 723 {
724 kdDebug() << "Dropped : " << text << endl; 724 kdDebug() << "Dropped : " << text << endl;
725 QStringList emails = QStringList::split(",",text); 725 QStringList emails = QStringList::split(",",text);
726 for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) { 726 for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) {
727 kdDebug() << " Email: " << (*it) << endl; 727 kdDebug() << " Email: " << (*it) << endl;
728 int pos = (*it).find("<"); 728 int pos = (*it).find("<");
729 QString name = (*it).left(pos); 729 QString name = (*it).left(pos);
730 QString email = (*it).mid(pos); 730 QString email = (*it).mid(pos);
731 if (!email.isEmpty()) { 731 if (!email.isEmpty()) {
732 mIncidence->addAttendee(new Attendee(name,email)); 732 mIncidence->addAttendee(new Attendee(name,email));
733 } 733 }
734 } 734 }
735 } 735 }
736#endif 736#endif
737} 737}
738 738
739 739
740QPtrList<KOAgendaItem> KOAgendaItem::conflictItems() 740QPtrList<KOAgendaItem> KOAgendaItem::conflictItems()
741{ 741{
742 return mConflictItems; 742 return mConflictItems;
743} 743}
744 744
745void KOAgendaItem::setConflictItems(QPtrList<KOAgendaItem> ci) 745void KOAgendaItem::setConflictItems(QPtrList<KOAgendaItem> ci)
746{ 746{
747 mConflictItems = ci; 747 mConflictItems = ci;
748 KOAgendaItem *item; 748 KOAgendaItem *item;
749 for ( item=mConflictItems.first(); item != 0; 749 for ( item=mConflictItems.first(); item != 0;
750 item=mConflictItems.next() ) { 750 item=mConflictItems.next() ) {
751 item->addConflictItem(this); 751 item->addConflictItem(this);
752 } 752 }
753} 753}
754 754
755void KOAgendaItem::addConflictItem(KOAgendaItem *ci) 755void KOAgendaItem::addConflictItem(KOAgendaItem *ci)
756{ 756{
757 if (mConflictItems.find(ci)<0) 757 if (mConflictItems.find(ci)<0)
758 mConflictItems.append(ci); 758 mConflictItems.append(ci);
759} 759}
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 3c7a1fb..5e82721 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,191 +1,191 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_off 2 CONFIG += qt warn_on
3 TARGET = kopi 3 TARGET = kopi
4OBJECTS_DIR = _obj/ 4OBJECTS_DIR = _obj/
5MOC_DIR = _moc 5MOC_DIR = _moc
6DESTDIR= ../bin 6DESTDIR= ../bin
7 7
8include( ../variables.pri ) 8include( ../variables.pri )
9 9
10INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim 10INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim
11#../qtcompat 11#../qtcompat
12DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL 12DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
13DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER 13DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
14#KORG_NOPRINTER KORG_NOKABC KORG_NODND 14#KORG_NOPRINTER KORG_NOKABC KORG_NODND
15DEFINES += KORG_NOLVALTERNATION 15DEFINES += KORG_NOLVALTERNATION
16DEFINES += DESKTOP_VERSION 16DEFINES += DESKTOP_VERSION
17unix : { 17unix : {
18LIBS += ../bin/libmicrokdepim.so 18LIBS += ../bin/libmicrokdepim.so
19LIBS += ../bin/libmicrokcal.so 19LIBS += ../bin/libmicrokcal.so
20LIBS += ../bin/libmicrokde.so 20LIBS += ../bin/libmicrokde.so
21LIBS += ../bin/libmicrokabc.so 21LIBS += ../bin/libmicrokabc.so
22#LIBS += -lbluetooth 22#LIBS += -lbluetooth
23#LIBS += -lsdp 23#LIBS += -lsdp
24 24
25#LIBS += -lldap 25#LIBS += -lldap
26OBJECTS_DIR = obj/unix 26OBJECTS_DIR = obj/unix
27MOC_DIR = moc/unix 27MOC_DIR = moc/unix
28} 28}
29win32: { 29win32: {
30RC_FILE = winicons.rc 30RC_FILE = winicons.rc
31DEFINES += _WIN32_ 31DEFINES += _WIN32_
32LIBS += ../bin/microkdepim.lib 32LIBS += ../bin/microkdepim.lib
33LIBS += ../bin/microkcal.lib 33LIBS += ../bin/microkcal.lib
34LIBS += ../bin/microkde.lib 34LIBS += ../bin/microkde.lib
35LIBS += ../bin/microkabc.lib 35LIBS += ../bin/microkabc.lib
36LIBS += ../libical/lib/ical.lib 36LIBS += ../libical/lib/ical.lib
37LIBS += ../libical/lib/icalss.lib 37LIBS += ../libical/lib/icalss.lib
38#LIBS += atls.lib 38#LIBS += atls.lib
39QMAKE_LINK += /NODEFAULTLIB:LIBC 39QMAKE_LINK += /NODEFAULTLIB:LIBC
40#QMAKE_LINK += /NODEFAULTLIB:MSVCRT 40#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
41#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib 41#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
42OBJECTS_DIR = obj/win 42OBJECTS_DIR = obj/win
43MOC_DIR = moc/win 43MOC_DIR = moc/win
44#olimport section 44#olimport section
45#blabla: { 45#blabla: {
46LIBS += mfc71u.lib 46LIBS += mfc71u.lib
47DEFINES += _OL_IMPORT_ 47DEFINES += _OL_IMPORT_
48 48
49HEADERS += ../outport/msoutl9.h \ 49HEADERS += ../outport/msoutl9.h \
50 koimportoldialog.h 50 koimportoldialog.h
51SOURCES += ../outport/msoutl9.cpp \ 51SOURCES += ../outport/msoutl9.cpp \
52 koimportoldialog.cpp 52 koimportoldialog.cpp
53#} 53#}
54#olimport section end 54#olimport section end
55 55
56} 56}
57 57
58 58
59INTERFACES = kofilterview_base.ui 59INTERFACES = kofilterview_base.ui
60#filteredit_base.ui 60#filteredit_base.ui
61 61
62# kdateedit.h \ 62# kdateedit.h \
63 63
64HEADERS += \ 64HEADERS += \
65 filteredit_base.h \ 65 filteredit_base.h \
66 alarmclient.h \ 66 alarmclient.h \
67 calendarview.h \ 67 calendarview.h \
68 customlistviewitem.h \ 68 customlistviewitem.h \
69 datenavigator.h \ 69 datenavigator.h \
70 docprefs.h \ 70 docprefs.h \
71 filtereditdialog.h \ 71 filtereditdialog.h \
72 incomingdialog.h \ 72 incomingdialog.h \
73 incomingdialog_base.h \ 73 incomingdialog_base.h \
74 interfaces/korganizer/baseview.h \ 74 interfaces/korganizer/baseview.h \
75 interfaces/korganizer/calendarviewbase.h \ 75 interfaces/korganizer/calendarviewbase.h \
76 journalentry.h \ 76 journalentry.h \
77 kdatenavigator.h \ 77 kdatenavigator.h \
78 koagenda.h \ 78 koagenda.h \
79 koagendaitem.h \ 79 koagendaitem.h \
80 koagendaview.h \ 80 koagendaview.h \
81 kocounterdialog.h \ 81 kocounterdialog.h \
82 kodaymatrix.h \ 82 kodaymatrix.h \
83 kodialogmanager.h \ 83 kodialogmanager.h \
84 koeditordetails.h \ 84 koeditordetails.h \
85 koeditorgeneral.h \ 85 koeditorgeneral.h \
86 koeditorgeneralevent.h \ 86 koeditorgeneralevent.h \
87 koeditorgeneraltodo.h \ 87 koeditorgeneraltodo.h \
88 koeditorrecurrence.h \ 88 koeditorrecurrence.h \
89 koeventeditor.h \ 89 koeventeditor.h \
90 koeventpopupmenu.h \ 90 koeventpopupmenu.h \
91 koeventview.h \ 91 koeventview.h \
92 koeventviewer.h \ 92 koeventviewer.h \
93 koeventviewerdialog.h \ 93 koeventviewerdialog.h \
94 kofilterview.h \ 94 kofilterview.h \
95 koglobals.h \ 95 koglobals.h \
96 koincidenceeditor.h \ 96 koincidenceeditor.h \
97 kojournalview.h \ 97 kojournalview.h \
98 kolistview.h \ 98 kolistview.h \
99 kolocationbox.h \ 99 kolocationbox.h \
100 komonthview.h \ 100 komonthview.h \
101 koprefs.h \ 101 koprefs.h \
102 koprefsdialog.h \ 102 koprefsdialog.h \
103 kotimespanview.h \ 103 kotimespanview.h \
104 kotodoeditor.h \ 104 kotodoeditor.h \
105 kotodoview.h \ 105 kotodoview.h \
106 kotodoviewitem.h \ 106 kotodoviewitem.h \
107 koviewmanager.h \ 107 koviewmanager.h \
108 kowhatsnextview.h \ 108 kowhatsnextview.h \
109 ktimeedit.h \ 109 ktimeedit.h \
110 lineview.h \ 110 lineview.h \
111 mainwindow.h \ 111 mainwindow.h \
112 navigatorbar.h \ 112 navigatorbar.h \
113 outgoingdialog.h \ 113 outgoingdialog.h \
114 outgoingdialog_base.h \ 114 outgoingdialog_base.h \
115 publishdialog.h \ 115 publishdialog.h \
116 publishdialog_base.h \ 116 publishdialog_base.h \
117 savetemplatedialog.h \ 117 savetemplatedialog.h \
118 searchdialog.h \ 118 searchdialog.h \
119 simplealarmclient.h \ 119 simplealarmclient.h \
120 statusdialog.h \ 120 statusdialog.h \
121 timeline.h \ 121 timeline.h \
122 timespanview.h \ 122 timespanview.h \
123 version.h \ 123 version.h \
124 ../kalarmd/alarmdialog.h \ 124 ../kalarmd/alarmdialog.h \
125 125
126 126
127SOURCES += \ 127SOURCES += \
128filteredit_base.cpp \ 128filteredit_base.cpp \
129 calendarview.cpp \ 129 calendarview.cpp \
130 datenavigator.cpp \ 130 datenavigator.cpp \
131 docprefs.cpp \ 131 docprefs.cpp \
132 filtereditdialog.cpp \ 132 filtereditdialog.cpp \
133 incomingdialog.cpp \ 133 incomingdialog.cpp \
134 incomingdialog_base.cpp \ 134 incomingdialog_base.cpp \
135 journalentry.cpp \ 135 journalentry.cpp \
136 kdatenavigator.cpp \ 136 kdatenavigator.cpp \
137 koagenda.cpp \ 137 koagenda.cpp \
138 koagendaitem.cpp \ 138 koagendaitem.cpp \
139 koagendaview.cpp \ 139 koagendaview.cpp \
140 kocounterdialog.cpp \ 140 kocounterdialog.cpp \
141 kodaymatrix.cpp \ 141 kodaymatrix.cpp \
142 kodialogmanager.cpp \ 142 kodialogmanager.cpp \
143 koeditordetails.cpp \ 143 koeditordetails.cpp \
144 koeditorgeneral.cpp \ 144 koeditorgeneral.cpp \
145 koeditorgeneralevent.cpp \ 145 koeditorgeneralevent.cpp \
146 koeditorgeneraltodo.cpp \ 146 koeditorgeneraltodo.cpp \
147 koeditorrecurrence.cpp \ 147 koeditorrecurrence.cpp \
148 koeventeditor.cpp \ 148 koeventeditor.cpp \
149 koeventpopupmenu.cpp \ 149 koeventpopupmenu.cpp \
150 koeventview.cpp \ 150 koeventview.cpp \
151 koeventviewer.cpp \ 151 koeventviewer.cpp \
152 koeventviewerdialog.cpp \ 152 koeventviewerdialog.cpp \
153 kofilterview.cpp \ 153 kofilterview.cpp \
154 koglobals.cpp \ 154 koglobals.cpp \
155 koincidenceeditor.cpp \ 155 koincidenceeditor.cpp \
156 kojournalview.cpp \ 156 kojournalview.cpp \
157 kolistview.cpp \ 157 kolistview.cpp \
158 kolocationbox.cpp \ 158 kolocationbox.cpp \
159 komonthview.cpp \ 159 komonthview.cpp \
160 koprefs.cpp \ 160 koprefs.cpp \
161 koprefsdialog.cpp \ 161 koprefsdialog.cpp \
162 kotimespanview.cpp \ 162 kotimespanview.cpp \
163 kotodoeditor.cpp \ 163 kotodoeditor.cpp \
164 kotodoview.cpp \ 164 kotodoview.cpp \
165 kotodoviewitem.cpp \ 165 kotodoviewitem.cpp \
166 koviewmanager.cpp \ 166 koviewmanager.cpp \
167 kowhatsnextview.cpp \ 167 kowhatsnextview.cpp \
168 ktimeedit.cpp \ 168 ktimeedit.cpp \
169 lineview.cpp \ 169 lineview.cpp \
170 main.cpp \ 170 main.cpp \
171 mainwindow.cpp \ 171 mainwindow.cpp \
172 navigatorbar.cpp \ 172 navigatorbar.cpp \
173 outgoingdialog.cpp \ 173 outgoingdialog.cpp \
174 outgoingdialog_base.cpp \ 174 outgoingdialog_base.cpp \
175 publishdialog.cpp \ 175 publishdialog.cpp \
176 publishdialog_base.cpp \ 176 publishdialog_base.cpp \
177 savetemplatedialog.cpp \ 177 savetemplatedialog.cpp \
178 searchdialog.cpp \ 178 searchdialog.cpp \
179 simplealarmclient.cpp \ 179 simplealarmclient.cpp \
180 statusdialog.cpp \ 180 statusdialog.cpp \
181 timeline.cpp \ 181 timeline.cpp \
182 timespanview.cpp \ 182 timespanview.cpp \
183 ../kalarmd/alarmdialog.cpp 183 ../kalarmd/alarmdialog.cpp
184 184
185HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h 185HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h
186INTERFACES += calprintdayconfig_base.ui \ 186INTERFACES += calprintdayconfig_base.ui \
187 calprintmonthconfig_base.ui \ 187 calprintmonthconfig_base.ui \
188 calprinttodoconfig_base.ui \ 188 calprinttodoconfig_base.ui \
189 calprintweekconfig_base.ui 189 calprintweekconfig_base.ui
190SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp 190SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp
191 191