summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp32
-rw-r--r--korganizer/koeditorgeneral.cpp34
2 files changed, 31 insertions, 35 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 5508210..f287216 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1,1576 +1,1586 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 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 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24#include <qhbox.h> 24#include <qhbox.h>
25#include <qvbox.h> 25#include <qvbox.h>
26#include <qlabel.h> 26#include <qlabel.h>
27#include <qframe.h> 27#include <qframe.h>
28#include <qlayout.h> 28#include <qlayout.h>
29#ifndef KORG_NOSPLITTER 29#ifndef KORG_NOSPLITTER
30#include <qsplitter.h> 30#include <qsplitter.h>
31#endif 31#endif
32#include <qfont.h> 32#include <qfont.h>
33#include <qfontmetrics.h> 33#include <qfontmetrics.h>
34#include <qpopupmenu.h> 34#include <qpopupmenu.h>
35#include <qtooltip.h> 35#include <qtooltip.h>
36#include <qpainter.h> 36#include <qpainter.h>
37#include <qpushbutton.h> 37#include <qpushbutton.h>
38#include <qapplication.h> 38#include <qapplication.h>
39 39
40#include <kapplication.h> 40#include <kapplication.h>
41#include <KDGanttMinimizeSplitter.h> 41#include <KDGanttMinimizeSplitter.h>
42#include <kdebug.h> 42#include <kdebug.h>
43#include <kstandarddirs.h> 43#include <kstandarddirs.h>
44#include <kiconloader.h> 44#include <kiconloader.h>
45#include <klocale.h> 45#include <klocale.h>
46#include <kconfig.h> 46#include <kconfig.h>
47#include <kglobal.h> 47#include <kglobal.h>
48#include "calendarview.h" 48#include "calendarview.h"
49#include "koviewmanager.h" 49#include "koviewmanager.h"
50 50
51#include <libkcal/calendar.h> 51#include <libkcal/calendar.h>
52#include <libkcal/icaldrag.h> 52#include <libkcal/icaldrag.h>
53#include <libkcal/dndfactory.h> 53#include <libkcal/dndfactory.h>
54 54
55#include <kcalendarsystem.h> 55#include <kcalendarsystem.h>
56 56
57#include "koglobals.h" 57#include "koglobals.h"
58#ifndef KORG_NOPLUGINS 58#ifndef KORG_NOPLUGINS
59#include "kocore.h" 59#include "kocore.h"
60#endif 60#endif
61#include "koprefs.h" 61#include "koprefs.h"
62#include "koagenda.h" 62#include "koagenda.h"
63#include "koagendaitem.h" 63#include "koagendaitem.h"
64#ifndef KORG_NOPRINTER 64#ifndef KORG_NOPRINTER
65#include "calprinter.h" 65#include "calprinter.h"
66#endif 66#endif
67 67
68#include "koagendaview.h" 68#include "koagendaview.h"
69//#include "koagendaview.moc" 69//#include "koagendaview.moc"
70 70
71//extern bool globalFlagBlockPainting; 71//extern bool globalFlagBlockPainting;
72extern int globalFlagBlockAgenda; 72extern int globalFlagBlockAgenda;
73extern int globalFlagBlockStartup; 73extern int globalFlagBlockStartup;
74extern int globalFlagBlockAgendaItemPaint; 74extern int globalFlagBlockAgendaItemPaint;
75extern int globalFlagBlockAgendaItemUpdate; 75extern int globalFlagBlockAgendaItemUpdate;
76extern int globalFlagBlockLabel; 76extern int globalFlagBlockLabel;
77using namespace KOrg; 77using namespace KOrg;
78 78
79 79
80 80
81TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) : 81TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) :
82 QScrollView(parent,name,f) 82 QScrollView(parent,name,f)
83{ 83{
84 mRows = rows; 84 mRows = rows;
85 85
86 setMinimumHeight( 20 ); 86 setMinimumHeight( 20 );
87 mCellHeight = KOPrefs::instance()->mHourSize*4; 87 mCellHeight = KOPrefs::instance()->mHourSize*4;
88 88
89 enableClipper(true); 89 enableClipper(true);
90 90
91 setHScrollBarMode(AlwaysOff); 91 setHScrollBarMode(AlwaysOff);
92 setVScrollBarMode(AlwaysOff); 92 setVScrollBarMode(AlwaysOff);
93 93
94 resizeContents(50,mRows * mCellHeight); 94 resizeContents(50,mRows * mCellHeight);
95 95
96 viewport()->setBackgroundMode( PaletteBackground ); 96 viewport()->setBackgroundMode( PaletteBackground );
97} 97}
98 98
99void TimeLabels::setCellHeight(int height) 99void TimeLabels::setCellHeight(int height)
100{ 100{
101 mCellHeight = height; 101 mCellHeight = height;
102} 102}
103 103
104/* 104/*
105 Optimization so that only the "dirty" portion of the scroll view 105 Optimization so that only the "dirty" portion of the scroll view
106 is redrawn. Unfortunately, this is not called by default paintEvent() method. 106 is redrawn. Unfortunately, this is not called by default paintEvent() method.
107*/ 107*/
108void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) 108void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
109{ 109{
110 110
111 // if ( globalFlagBlockAgenda ) 111 // if ( globalFlagBlockAgenda )
112 // return; 112 // return;
113 // bug: the parameters cx, cy, cw, ch are the areas that need to be 113 // bug: the parameters cx, cy, cw, ch are the areas that need to be
114 // redrawn, not the area of the widget. unfortunately, this 114 // redrawn, not the area of the widget. unfortunately, this
115 // code assumes the latter... 115 // code assumes the latter...
116 116
117 // now, for a workaround... 117 // now, for a workaround...
118 // these two assignments fix the weird redraw bug 118 // these two assignments fix the weird redraw bug
119 cx = contentsX() + 2; 119 cx = contentsX() + 2;
120 cw = contentsWidth() - 2; 120 cw = contentsWidth() - 2;
121 // end of workaround 121 // end of workaround
122 122
123 int cell = ((int)(cy/mCellHeight)); 123 int cell = ((int)(cy/mCellHeight));
124 int y = cell * mCellHeight; 124 int y = cell * mCellHeight;
125 QFontMetrics fm = fontMetrics(); 125 QFontMetrics fm = fontMetrics();
126 QString hour; 126 QString hour;
127 QString suffix; 127 QString suffix;
128 QString fullTime; 128 QString fullTime;
129 int tW = fm.width("24:00i"); 129 int tW = fm.width("24:00i");
130 int timeHeight = fm.height();
131 if ( timeHeight > mCellHeight )
132 timeHeight = mCellHeight-1;
133 int borderWidth = 5;
134 QFont nFont = p->font();
135 QFont sFont = nFont;
136 sFont.setPointSize( sFont.pointSize()/2+2 );
137 if (!KGlobal::locale()->use12Clock())
138 suffix = "00";
139 QFontMetrics fmS( sFont );
140 int sHei = fmS.height();
130 141
131 while (y < cy + ch) { 142 while (y < cy + ch) {
132 p->drawLine(cx,y,cx+tW,y); 143 p->drawLine(cx,y,cx+tW,y);
133 hour.setNum(cell); 144 hour.setNum(cell);
134 suffix = "am";
135 145
136 // handle 24h and am/pm time formats 146 // handle 24h and am/pm time formats
137 if (KGlobal::locale()->use12Clock()) { 147 if (KGlobal::locale()->use12Clock()) {
138 if (cell > 11) suffix = "pm"; 148 if (cell > 11) suffix = "pm";
149 else
150 suffix = "am";
139 if (cell == 0) hour.setNum(12); 151 if (cell == 0) hour.setNum(12);
140 if (cell > 12) hour.setNum(cell - 12); 152 if (cell > 12) hour.setNum(cell - 12);
141 } else {
142 suffix = ":00";
143 } 153 }
144 154
145 // create string in format of "XX:XX" or "XXpm/am" 155 // create string in format of "XX:XX" or "XXpm/am"
146 fullTime = hour + suffix; 156 fullTime = hour;// + suffix;
147 157
148 // center and draw the time label 158 // center and draw the time label
149 int timeWidth = fm.width(fullTime+"i"); 159 int timeWidth = fm.width(fullTime+"i");
150 int offset = this->width() - timeWidth; 160 int tw2 = fm.width(suffix);
151 int borderWidth = 5; 161 int offset = this->width() - timeWidth - tw2;
152 int timeHeight = fm.height(); 162 p->setFont( nFont );
153 timeHeight = timeHeight + 2 - ( timeHeight / 4 ); 163 p->drawText(cx - borderWidth + offset, y+ timeHeight, fullTime);
154 p->drawText(cx -borderWidth + offset, y+ timeHeight, fullTime); 164 p->setFont( sFont );
165 offset += timeWidth;
166 p->drawText(cx - borderWidth + offset, y+ sHei, suffix);
155 167
156 // increment indices 168 // increment indices
157 y += mCellHeight; 169 y += mCellHeight;
158 cell++; 170 cell++;
159 } 171 }
160} 172}
161 173
162/** 174/**
163 Calculates the minimum width. 175 Calculates the minimum width.
164*/ 176*/
165int TimeLabels::minimumWidth() const 177int TimeLabels::minimumWidth() const
166{ 178{
167 QFontMetrics fm = fontMetrics(); 179 QFontMetrics fm = fontMetrics();
168 180
169 //TODO: calculate this value 181 //TODO: calculate this value
170 int borderWidth = 4; 182 int borderWidth = 4;
171 183
172 // the maximum width possible 184 // the maximum width possible
173 int width = fm.width("88:88x") + borderWidth; 185 int width = fm.width("88:88x") + borderWidth;
174 186
175 return width; 187 return width;
176} 188}
177 189
178/** updates widget's internal state */ 190/** updates widget's internal state */
179void TimeLabels::updateConfig() 191void TimeLabels::updateConfig()
180{ 192{
181 // set the font 193 // set the font
182 // config->setGroup("Fonts"); 194 // config->setGroup("Fonts");
183 // QFont font = config->readFontEntry("TimeBar Font"); 195 // QFont font = config->readFontEntry("TimeBar Font");
184 setFont(KOPrefs::instance()->mTimeBarFont); 196 setFont(KOPrefs::instance()->mTimeBarFont);
185 197
186 // update geometry restrictions based on new settings 198 // update geometry restrictions based on new settings
187 setFixedWidth(minimumWidth()); 199 setFixedWidth(minimumWidth());
188 200
189 // update HourSize 201 // update HourSize
190 mCellHeight = KOPrefs::instance()->mHourSize*4; 202 mCellHeight = KOPrefs::instance()->mHourSize*4;
191 resizeContents(50,mRows * mCellHeight); 203 resizeContents(50,mRows * mCellHeight);
192} 204}
193 205
194/** update time label positions */ 206/** update time label positions */
195void TimeLabels::positionChanged() 207void TimeLabels::positionChanged()
196{ 208{
197 int adjustment = mAgenda->contentsY(); 209 int adjustment = mAgenda->contentsY();
198 setContentsPos(0, adjustment); 210 setContentsPos(0, adjustment);
199} 211}
200 212
201/** */ 213/** */
202void TimeLabels::setAgenda(KOAgenda* agenda) 214void TimeLabels::setAgenda(KOAgenda* agenda)
203{ 215{
204 mAgenda = agenda; 216 mAgenda = agenda;
205} 217}
206 218
207void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) 219void TimeLabels::contentsMousePressEvent ( QMouseEvent * e)
208{ 220{
209 mMouseDownY = e->pos().y(); 221 mMouseDownY = e->pos().y();
210 mOrgCap = topLevelWidget()->caption(); 222 mOrgCap = topLevelWidget()->caption();
211} 223}
212 224
213void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) 225void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e )
214{ 226{
215 int diff = mMouseDownY - e->pos().y(); 227 int diff = mMouseDownY - e->pos().y();
216 if ( diff < 10 && diff > -10 ) 228 if ( diff < 10 && diff > -10 )
217 return; 229 return;
218 int tSize = KOPrefs::instance()->mHourSize + (diff/10) ; 230 int tSize = KOPrefs::instance()->mHourSize + (diff/10) ;
219 if ( tSize < 4 ) 231 if ( tSize < 4 )
220 tSize = 4; 232 tSize = 4;
221 if ( tSize > 22 ) 233 if ( tSize > 22 )
222 tSize = 22; 234 tSize = 22;
223 tSize = (tSize-2)/2; 235 tSize = (tSize-2)/2;
224 topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize)); 236 topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize));
225 237
226} 238}
227void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e ) 239void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e )
228{ 240{
229 topLevelWidget()->setCaption( mOrgCap ); 241 topLevelWidget()->setCaption( mOrgCap );
230 int diff = mMouseDownY - e->pos().y(); 242 int diff = mMouseDownY - e->pos().y();
231 if ( diff < 10 && diff > -10 ) 243 if ( diff < 10 && diff > -10 )
232 return; 244 return;
233 int tSize = KOPrefs::instance()->mHourSize + (diff/10); 245 int tSize = KOPrefs::instance()->mHourSize + (diff/10);
234 if ( tSize < 4 ) 246 if ( tSize < 4 )
235 tSize = 4; 247 tSize = 4;
236 if ( tSize > 22 ) 248 if ( tSize > 22 )
237 tSize = 22; 249 tSize = 22;
238 tSize = (tSize/2)*2; 250 tSize = (tSize/2)*2;
239 if ( tSize == KOPrefs::instance()->mHourSize ) 251 if ( tSize == KOPrefs::instance()->mHourSize )
240 return; 252 return;
241 KOPrefs::instance()->mHourSize = tSize; 253 KOPrefs::instance()->mHourSize = tSize;
242 emit scaleChanged(); 254 emit scaleChanged();
243} 255}
244 256
245/** This is called in response to repaint() */ 257/** This is called in response to repaint() */
246void TimeLabels::paintEvent(QPaintEvent*) 258void TimeLabels::paintEvent(QPaintEvent*)
247{ 259{
248 260
249 // kdDebug() << "paintevent..." << endl; 261 // kdDebug() << "paintevent..." << endl;
250 // this is another hack! 262 // this is another hack!
251 // QPainter painter(this); 263 // QPainter painter(this);
252 //QString c 264 //QString c
253 repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight()); 265 repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight());
254} 266}
255 267
256//////////////////////////////////////////////////////////////////////////// 268////////////////////////////////////////////////////////////////////////////
257 269
258EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name) 270EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name)
259 : QFrame(parent,name) 271 : QFrame(parent,name)
260{ 272{
261 mColumns = 1; 273 mColumns = 1;
262 mTopBox = 0; 274 mTopBox = 0;
263 mLocation = loc; 275 mLocation = loc;
264 mTopLayout = 0; 276 mTopLayout = 0;
265 mPaintWidget = 0; 277 mPaintWidget = 0;
266 mXOffset = 0; 278 mXOffset = 0;
267 if (mLocation == Top) mPixmap = SmallIcon("1uparrow"); 279 if (mLocation == Top) mPixmap = SmallIcon("1uparrow");
268 else mPixmap = SmallIcon("1downarrow"); 280 else mPixmap = SmallIcon("1downarrow");
269 mEnabled.resize(mColumns); 281 mEnabled.resize(mColumns);
270 mEnabled.fill( false ); 282 mEnabled.fill( false );
271 setMinimumHeight(mPixmap.height()); 283 setMinimumHeight(mPixmap.height());
272} 284}
273 285
274EventIndicator::~EventIndicator() 286EventIndicator::~EventIndicator()
275{ 287{
276} 288}
277 289
278void EventIndicator::drawContents(QPainter *p) 290void EventIndicator::drawContents(QPainter *p)
279{ 291{
280 292
281 // kdDebug() << "======== top: " << contentsRect().top() << " bottom " << // contentsRect().bottom() << " left " << contentsRect().left() << " right " << contentsRect().right() << endl; 293 // kdDebug() << "======== top: " << contentsRect().top() << " bottom " << // contentsRect().bottom() << " left " << contentsRect().left() << " right " << contentsRect().right() << endl;
282 KDGanttSplitterHandle* han = 0; 294 KDGanttSplitterHandle* han = 0;
283 if ( mPaintWidget ) 295 if ( mPaintWidget )
284 han = mPaintWidget->firstHandle(); 296 han = mPaintWidget->firstHandle();
285 if ( ! han ) { 297 if ( ! han ) {
286 int i; 298 int i;
287 for(i=0;i<mColumns;++i) { 299 for(i=0;i<mColumns;++i) {
288 if (mEnabled[i]) { 300 if (mEnabled[i]) {
289 int cellWidth = contentsRect().right()/mColumns; 301 int cellWidth = contentsRect().right()/mColumns;
290 int xOffset = KOGlobals::self()->reverseLayout() ? 302 int xOffset = KOGlobals::self()->reverseLayout() ?
291 (mColumns - 1 - i)*cellWidth + (cellWidth -mPixmap.width())/2 : 303 (mColumns - 1 - i)*cellWidth + (cellWidth -mPixmap.width())/2 :
292 i*cellWidth + (cellWidth -mPixmap.width()) /2; 304 i*cellWidth + (cellWidth -mPixmap.width()) /2;
293 p->drawPixmap(QPoint(1+xOffset,0),mPixmap); 305 p->drawPixmap(QPoint(1+xOffset,0),mPixmap);
294 } 306 }
295 } 307 }
296 } else { 308 } else {
297 han->repaint(); 309 han->repaint();
298 //mPaintWidget->setBackgroundColor( red ); 310 //mPaintWidget->setBackgroundColor( red );
299 311
300 QPainter pa( han ); 312 QPainter pa( han );
301 int i; 313 int i;
302 bool setColor = false; 314 bool setColor = false;
303 for(i=0;i<mColumns;++i) { 315 for(i=0;i<mColumns;++i) {
304 if (mEnabled[i]) { 316 if (mEnabled[i]) {
305 setColor = true; 317 setColor = true;
306 318
307 int cellWidth = contentsRect().right()/mColumns; 319 int cellWidth = contentsRect().right()/mColumns;
308 int xOffset = KOGlobals::self()->reverseLayout() ? 320 int xOffset = KOGlobals::self()->reverseLayout() ?
309 (mColumns - 1 - i)*cellWidth + cellWidth/2 -mPixmap.width()/2 : 321 (mColumns - 1 - i)*cellWidth + cellWidth/2 -mPixmap.width()/2 :
310 i*cellWidth + cellWidth/2 -mPixmap.width()/2; 322 i*cellWidth + cellWidth/2 -mPixmap.width()/2;
311 pa.drawPixmap(QPoint(mXOffset + xOffset,0),mPixmap); 323 pa.drawPixmap(QPoint(mXOffset + xOffset,0),mPixmap);
312 //qDebug("222draw pix %d ",xOffset ); 324 //qDebug("222draw pix %d ",xOffset );
313 325
314 } 326 }
315 327
316 } 328 }
317 pa.end(); 329 pa.end();
318 330
319 } 331 }
320} 332}
321 333
322void EventIndicator::setXOffset( int x ) 334void EventIndicator::setXOffset( int x )
323{ 335{
324 mXOffset = x; 336 mXOffset = x;
325} 337}
326void EventIndicator::setPaintWidget( KDGanttMinimizeSplitter * w ) 338void EventIndicator::setPaintWidget( KDGanttMinimizeSplitter * w )
327{ 339{
328 mPaintWidget = w; 340 mPaintWidget = w;
329 setMaximumHeight(0); 341 setMaximumHeight(0);
330 setMinimumHeight(0); 342 setMinimumHeight(0);
331} 343}
332void EventIndicator::changeColumns(int columns) 344void EventIndicator::changeColumns(int columns)
333{ 345{
334 mColumns = columns; 346 mColumns = columns;
335 mEnabled.resize(mColumns); 347 mEnabled.resize(mColumns);
336 348
337 update(); 349 update();
338} 350}
339 351
340void EventIndicator::enableColumn(int column, bool enable) 352void EventIndicator::enableColumn(int column, bool enable)
341{ 353{
342 mEnabled[column] = enable; 354 mEnabled[column] = enable;
343} 355}
344 356
345 357
346//////////////////////////////////////////////////////////////////////////// 358////////////////////////////////////////////////////////////////////////////
347//////////////////////////////////////////////////////////////////////////// 359////////////////////////////////////////////////////////////////////////////
348//////////////////////////////////////////////////////////////////////////// 360////////////////////////////////////////////////////////////////////////////
349 361
350KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : 362KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
351 KOEventView (cal,parent,name) 363 KOEventView (cal,parent,name)
352{ 364{
353 mBlockUpdating = true; 365 mBlockUpdating = true;
354 mStartHour = 8; 366 mStartHour = 8;
355 mSelectedDates.append(QDate::currentDate()); 367 mSelectedDates.append(QDate::currentDate());
356 368
357 mLayoutDayLabels = 0; 369 mLayoutDayLabels = 0;
358 mDayLabelsFrame = 0; 370 mDayLabelsFrame = 0;
359 mDayLabels = 0; 371 mDayLabels = 0;
360 bool isRTL = KOGlobals::self()->reverseLayout(); 372 bool isRTL = KOGlobals::self()->reverseLayout();
361 373
362 if ( KOPrefs::instance()->mVerticalScreen ) { 374 if ( KOPrefs::instance()->mVerticalScreen ) {
363 mExpandedPixmap = SmallIcon( "1downarrow" ); 375 mExpandedPixmap = SmallIcon( "1downarrow" );
364 mNotExpandedPixmap = SmallIcon( "1uparrow" ); 376 mNotExpandedPixmap = SmallIcon( "1uparrow" );
365 } else { 377 } else {
366 mExpandedPixmap = SmallIcon( isRTL ? "1leftarrow" : "1rightarrow" ); 378 mExpandedPixmap = SmallIcon( isRTL ? "1leftarrow" : "1rightarrow" );
367 mNotExpandedPixmap = SmallIcon( isRTL ? "1rightarrow" : "1leftarrow" ); 379 mNotExpandedPixmap = SmallIcon( isRTL ? "1rightarrow" : "1leftarrow" );
368 } 380 }
369 381
370 QBoxLayout *topLayout = new QVBoxLayout(this); 382 QBoxLayout *topLayout = new QVBoxLayout(this);
371 383
372 // Create day name labels for agenda columns 384 // Create day name labels for agenda columns
373 // Create agenda splitter 385 // Create agenda splitter
374 386
375 mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this); 387 mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this);
376 mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); 388 mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
377 topLayout->addWidget( mSplitterAgenda ); 389 topLayout->addWidget( mSplitterAgenda );
378 mAllDayFrame = new QHBox(mSplitterAgenda); 390 mAllDayFrame = new QHBox(mSplitterAgenda);
379 mAllDayFrame->setFocusPolicy(NoFocus); 391 mAllDayFrame->setFocusPolicy(NoFocus);
380 QWidget *agendaFrame = new QWidget(mSplitterAgenda); 392 QWidget *agendaFrame = new QWidget(mSplitterAgenda);
381 agendaFrame->setFocusPolicy(NoFocus); 393 agendaFrame->setFocusPolicy(NoFocus);
382 394
383 // Create all-day agenda widget 395 // Create all-day agenda widget
384 mDummyAllDayLeft = new QVBox( mAllDayFrame ); 396 mDummyAllDayLeft = new QVBox( mAllDayFrame );
385 397
386 mExpandButton = new QPushButton(mDummyAllDayLeft); 398 mExpandButton = new QPushButton(mDummyAllDayLeft);
387 mExpandButton->setPixmap( mNotExpandedPixmap ); 399 mExpandButton->setPixmap( mNotExpandedPixmap );
388 int widebut = mExpandButton->sizeHint().width(); 400 int widebut = mExpandButton->sizeHint().width();
389 if ( QApplication::desktop()->width() < 480 ) 401 if ( QApplication::desktop()->width() < 480 )
390 widebut = widebut*2; 402 widebut = widebut*2;
391 else 403 else
392 widebut = (widebut*3) / 2; 404 widebut = (widebut*3) / 2;
393 //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, 405 //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed,
394 // QSizePolicy::Fixed ) ); 406 // QSizePolicy::Fixed ) );
395 mExpandButton->setFixedSize( widebut, widebut); 407 mExpandButton->setFixedSize( widebut, widebut);
396 connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) ); 408 connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) );
397 mExpandButton->setFocusPolicy(NoFocus); 409 mExpandButton->setFocusPolicy(NoFocus);
398 mAllDayAgenda = new KOAgenda(1,mAllDayFrame); 410 mAllDayAgenda = new KOAgenda(1,mAllDayFrame);
399 mAllDayAgenda->setFocusPolicy(NoFocus); 411 mAllDayAgenda->setFocusPolicy(NoFocus);
400 QLabel *dummyAllDayRight = new QLabel (mAllDayFrame); 412 QLabel *dummyAllDayRight = new QLabel (mAllDayFrame);
401 413
402 // Create event context menu for all day agenda 414 // Create event context menu for all day agenda
403 mAllDayAgendaPopup = eventPopup(); 415 mAllDayAgendaPopup = eventPopup();
404 connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), 416 connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
405 mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *))); 417 mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
406 418
407 // Create agenda frame 419 // Create agenda frame
408 QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3); 420 QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3);
409 // QHBox *agendaFrame = new QHBox(splitterAgenda); 421 // QHBox *agendaFrame = new QHBox(splitterAgenda);
410 422
411 // create event indicator bars 423 // create event indicator bars
412 mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame); 424 mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame);
413#ifndef DESKTOP_VERSION 425#ifndef DESKTOP_VERSION
414 // FIX 426 // FIX
415 mEventIndicatorTop->setPaintWidget( mSplitterAgenda ); 427 mEventIndicatorTop->setPaintWidget( mSplitterAgenda );
416#endif 428#endif
417 mDayLabelsFrame = new QHBox(agendaFrame); 429 mDayLabelsFrame = new QHBox(agendaFrame);
418 //topLayout->addWidget(mDayLabelsFrame); 430 //topLayout->addWidget(mDayLabelsFrame);
419 mDayLabels = new QFrame (mDayLabelsFrame); 431 mDayLabels = new QFrame (mDayLabelsFrame);
420 mLayoutDayLabels = new QHBoxLayout(mDayLabels); 432 mLayoutDayLabels = new QHBoxLayout(mDayLabels);
421 agendaLayout->addMultiCellWidget(mDayLabelsFrame ,0,0,0,2); 433 agendaLayout->addMultiCellWidget(mDayLabelsFrame ,0,0,0,2);
422 agendaLayout->addWidget(mEventIndicatorTop,1,1); 434 agendaLayout->addWidget(mEventIndicatorTop,1,1);
423 435
424 mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom, 436 mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom,
425 agendaFrame); 437 agendaFrame);
426 agendaLayout->addWidget(mEventIndicatorBottom,3,1); 438 agendaLayout->addWidget(mEventIndicatorBottom,3,1);
427 QWidget *dummyAgendaRight = new QWidget(agendaFrame); 439 QWidget *dummyAgendaRight = new QWidget(agendaFrame);
428 agendaLayout->addWidget(dummyAgendaRight,1,2); 440 agendaLayout->addWidget(dummyAgendaRight,1,2);
429 441
430 // Create time labels 442 // Create time labels
431 mTimeLabels = new TimeLabels(24,agendaFrame); 443 mTimeLabels = new TimeLabels(24,agendaFrame);
432 agendaLayout->addWidget(mTimeLabels,2,0); 444 agendaLayout->addWidget(mTimeLabels,2,0);
433 connect(mTimeLabels,SIGNAL( scaleChanged()), 445 connect(mTimeLabels,SIGNAL( scaleChanged()),
434 this,SLOT(updateConfig())); 446 this,SLOT(updateConfig()));
435 447
436 // Create agenda 448 // Create agenda
437 mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame); 449 mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame);
438 agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2); 450 agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2);
439 agendaLayout->setColStretch(1,1); 451 agendaLayout->setColStretch(1,1);
440 mAgenda->setFocusPolicy(NoFocus); 452 mAgenda->setFocusPolicy(NoFocus);
441 // Create event context menu for agenda 453 // Create event context menu for agenda
442 mAgendaPopup = eventPopup(); 454 mAgendaPopup = eventPopup();
443 455
444 mAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")), 456 mAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
445 i18n("Toggle Alarm"),mAgenda, 457 i18n("Toggle Alarm"),mAgenda,
446 SLOT(popupAlarm()),true); 458 SLOT(popupAlarm()),true);
447 459
448 460
449 connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), 461 connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
450 mAgendaPopup,SLOT(showIncidencePopup(Incidence *))); 462 mAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
451 463
452 // make connections between dependent widgets 464 // make connections between dependent widgets
453 mTimeLabels->setAgenda(mAgenda); 465 mTimeLabels->setAgenda(mAgenda);
454 466
455 // Update widgets to reflect user preferences 467 // Update widgets to reflect user preferences
456 // updateConfig(); 468 // updateConfig();
457 469
458 // createDayLabels(); 470 // createDayLabels();
459 471
460 // these blank widgets make the All Day Event box line up with the agenda 472 // these blank widgets make the All Day Event box line up with the agenda
461 dummyAllDayRight->setFixedWidth(mAgenda->verticalScrollBar()->width()); 473 dummyAllDayRight->setFixedWidth(mAgenda->verticalScrollBar()->width());
462 dummyAgendaRight->setFixedWidth(mAgenda->verticalScrollBar()->width()); 474 dummyAgendaRight->setFixedWidth(mAgenda->verticalScrollBar()->width());
463 mDummyAllDayLeft->setFixedWidth(mTimeLabels->width()); 475 mDummyAllDayLeft->setFixedWidth(mTimeLabels->width());
464 476
465 // Scrolling 477 // Scrolling
466 connect(mAgenda->verticalScrollBar(),SIGNAL(valueChanged(int)), 478 connect(mAgenda->verticalScrollBar(),SIGNAL(valueChanged(int)),
467 mTimeLabels, SLOT(positionChanged())); 479 mTimeLabels, SLOT(positionChanged()));
468 connect(mTimeLabels->verticalScrollBar(),SIGNAL(valueChanged(int)), 480 connect(mTimeLabels->verticalScrollBar(),SIGNAL(valueChanged(int)),
469 SLOT(setContentsPos(int))); 481 SLOT(setContentsPos(int)));
470 482
471 connect(mAgenda,SIGNAL(showDateView( int, QDate )),SIGNAL(showDateView( int, QDate ))); 483 connect(mAgenda,SIGNAL(showDateView( int, QDate )),SIGNAL(showDateView( int, QDate )));
472 connect(mAllDayAgenda,SIGNAL(showDateView( int, QDate )),SIGNAL(showDateView( int, QDate ))); 484 connect(mAllDayAgenda,SIGNAL(showDateView( int, QDate )),SIGNAL(showDateView( int, QDate )));
473 485
474 // Create/Show/Edit/Delete Event 486 // Create/Show/Edit/Delete Event
475 connect(mAgenda,SIGNAL(newEventSignal(int,int)), 487 connect(mAgenda,SIGNAL(newEventSignal(int,int)),
476 SLOT(newEvent(int,int))); 488 SLOT(newEvent(int,int)));
477 connect(mAgenda,SIGNAL(newTodoSignal(int,int)), 489 connect(mAgenda,SIGNAL(newTodoSignal(int,int)),
478 SLOT(newTodo(int,int))); 490 SLOT(newTodo(int,int)));
479 connect(mAgenda,SIGNAL(newEventSignal(int,int,int,int)), 491 connect(mAgenda,SIGNAL(newEventSignal(int,int,int,int)),
480 SLOT(newEvent(int,int,int,int))); 492 SLOT(newEvent(int,int,int,int)));
481 connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int)), 493 connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int)),
482 SLOT(newEventAllDay(int,int))); 494 SLOT(newEventAllDay(int,int)));
483 connect(mAllDayAgenda,SIGNAL(newTodoSignal(int,int)), 495 connect(mAllDayAgenda,SIGNAL(newTodoSignal(int,int)),
484 SLOT(newTodoAllDay(int,int))); 496 SLOT(newTodoAllDay(int,int)));
485 connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int,int,int)), 497 connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int,int,int)),
486 SLOT(newEventAllDay(int,int))); 498 SLOT(newEventAllDay(int,int)));
487 connect(mAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)), 499 connect(mAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)),
488 SLOT(newTimeSpanSelected(int,int,int,int))); 500 SLOT(newTimeSpanSelected(int,int,int,int)));
489 connect(mAllDayAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)), 501 connect(mAllDayAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)),
490 SLOT(newTimeSpanSelectedAllDay(int,int,int,int))); 502 SLOT(newTimeSpanSelectedAllDay(int,int,int,int)));
491 connect(mAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView())); 503 connect(mAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView()));
492 connect(mAllDayAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView())); 504 connect(mAllDayAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView()));
493 505
494 connect(mAgenda,SIGNAL(editIncidenceSignal(Incidence *)), 506 connect(mAgenda,SIGNAL(editIncidenceSignal(Incidence *)),
495 SIGNAL(editIncidenceSignal(Incidence *))); 507 SIGNAL(editIncidenceSignal(Incidence *)));
496 connect(mAllDayAgenda,SIGNAL(editIncidenceSignal(Incidence *)), 508 connect(mAllDayAgenda,SIGNAL(editIncidenceSignal(Incidence *)),
497 SIGNAL(editIncidenceSignal(Incidence *))); 509 SIGNAL(editIncidenceSignal(Incidence *)));
498 connect(mAgenda,SIGNAL(showIncidenceSignal(Incidence *)), 510 connect(mAgenda,SIGNAL(showIncidenceSignal(Incidence *)),
499 SIGNAL(showIncidenceSignal(Incidence *))); 511 SIGNAL(showIncidenceSignal(Incidence *)));
500 connect(mAllDayAgenda,SIGNAL(showIncidenceSignal(Incidence *)), 512 connect(mAllDayAgenda,SIGNAL(showIncidenceSignal(Incidence *)),
501 SIGNAL(showIncidenceSignal(Incidence *))); 513 SIGNAL(showIncidenceSignal(Incidence *)));
502 connect(mAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)), 514 connect(mAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)),
503 SIGNAL(deleteIncidenceSignal(Incidence *))); 515 SIGNAL(deleteIncidenceSignal(Incidence *)));
504 connect(mAllDayAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)), 516 connect(mAllDayAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)),
505 SIGNAL(deleteIncidenceSignal(Incidence *))); 517 SIGNAL(deleteIncidenceSignal(Incidence *)));
506 518
507 connect(mAgenda,SIGNAL(itemModified(KOAgendaItem *, int )), 519 connect(mAgenda,SIGNAL(itemModified(KOAgendaItem *, int )),
508 SLOT(updateEventDates(KOAgendaItem *, int ))); 520 SLOT(updateEventDates(KOAgendaItem *, int )));
509 connect(mAllDayAgenda,SIGNAL(itemModified(KOAgendaItem *, int )), 521 connect(mAllDayAgenda,SIGNAL(itemModified(KOAgendaItem *, int )),
510 SLOT(updateEventDates(KOAgendaItem *, int))); 522 SLOT(updateEventDates(KOAgendaItem *, int)));
511 523
512 // event indicator update 524 // event indicator update
513 connect(mAgenda,SIGNAL(lowerYChanged(int)), 525 connect(mAgenda,SIGNAL(lowerYChanged(int)),
514 SLOT(updateEventIndicatorTop(int))); 526 SLOT(updateEventIndicatorTop(int)));
515 connect(mAgenda,SIGNAL(upperYChanged(int)), 527 connect(mAgenda,SIGNAL(upperYChanged(int)),
516 SLOT(updateEventIndicatorBottom(int))); 528 SLOT(updateEventIndicatorBottom(int)));
517 // drag signals 529 // drag signals
518 /* 530 /*
519 connect(mAgenda,SIGNAL(startDragSignal(Event *)), 531 connect(mAgenda,SIGNAL(startDragSignal(Event *)),
520 SLOT(startDrag(Event *))); 532 SLOT(startDrag(Event *)));
521 connect(mAllDayAgenda,SIGNAL(startDragSignal(Event *)), 533 connect(mAllDayAgenda,SIGNAL(startDragSignal(Event *)),
522 SLOT(startDrag(Event *))); 534 SLOT(startDrag(Event *)));
523 */ 535 */
524 // synchronize selections 536 // synchronize selections
525 connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ), 537 connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
526 mAllDayAgenda, SLOT( deselectItem() ) ); 538 mAllDayAgenda, SLOT( deselectItem() ) );
527 connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ), 539 connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
528 mAgenda, SLOT( deselectItem() ) ); 540 mAgenda, SLOT( deselectItem() ) );
529 connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ), 541 connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
530 SIGNAL( incidenceSelected( Incidence * ) ) ); 542 SIGNAL( incidenceSelected( Incidence * ) ) );
531 connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ), 543 connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ),
532 SIGNAL( incidenceSelected( Incidence * ) ) ); 544 SIGNAL( incidenceSelected( Incidence * ) ) );
533 connect( mAgenda, SIGNAL( resizedSignal() ), 545 connect( mAgenda, SIGNAL( resizedSignal() ),
534 SLOT( updateConfig( ) ) ); 546 SLOT( updateConfig( ) ) );
535 connect( mAgenda, SIGNAL( addToCalSignal(Incidence *, Incidence *) ), 547 connect( mAgenda, SIGNAL( addToCalSignal(Incidence *, Incidence *) ),
536 SLOT( addToCalSlot(Incidence *, Incidence * ) ) ); 548 SLOT( addToCalSlot(Incidence *, Incidence * ) ) );
537 connect( mAllDayAgenda, SIGNAL( addToCalSignal(Incidence * ,Incidence *) ), 549 connect( mAllDayAgenda, SIGNAL( addToCalSignal(Incidence * ,Incidence *) ),
538 SLOT( addToCalSlot(Incidence * , Incidence *) ) ); 550 SLOT( addToCalSlot(Incidence * , Incidence *) ) );
539 // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); 551 // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
540 //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); 552 //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
541 553
542 554
543} 555}
544 556
545void KOAgendaView::toggleAllDay() 557void KOAgendaView::toggleAllDay()
546{ 558{
547 if ( mSplitterAgenda->firstHandle() ) 559 if ( mSplitterAgenda->firstHandle() )
548 mSplitterAgenda->firstHandle()->toggle(); 560 mSplitterAgenda->firstHandle()->toggle();
549} 561}
550void KOAgendaView::addToCalSlot(Incidence * inc, Incidence * incOld ) 562void KOAgendaView::addToCalSlot(Incidence * inc, Incidence * incOld )
551{ 563{
552 calendar()->addIncidence( inc ); 564 calendar()->addIncidence( inc );
553 565
554 if ( incOld ) { 566 if ( incOld ) {
555 if ( incOld->type() == "Todo" ) 567 if ( incOld->type() == "Todo" )
556 emit todoMoved((Todo*)incOld, KOGlobals::EVENTEDITED ); 568 emit todoMoved((Todo*)incOld, KOGlobals::EVENTEDITED );
557 else 569 else
558 emit incidenceChanged(incOld, KOGlobals::EVENTEDITED); 570 emit incidenceChanged(incOld, KOGlobals::EVENTEDITED);
559 } 571 }
560 572
561} 573}
562 574
563KOAgendaView::~KOAgendaView() 575KOAgendaView::~KOAgendaView()
564{ 576{
565 delete mAgendaPopup; 577 delete mAgendaPopup;
566 delete mAllDayAgendaPopup; 578 delete mAllDayAgendaPopup;
567 delete KOAgendaItem::paintPix(); 579 delete KOAgendaItem::paintPix();
568 delete KOAgendaItem::paintPixSel(); 580 delete KOAgendaItem::paintPixSel();
569} 581}
570void KOAgendaView::resizeEvent( QResizeEvent* e ) 582void KOAgendaView::resizeEvent( QResizeEvent* e )
571{ 583{
572 //qDebug("KOAgendaView::resizeEvent( QResizeEvent* e ) %d ", e->size().width()); 584 //qDebug("KOAgendaView::resizeEvent( QResizeEvent* e ) %d ", e->size().width());
573 bool uc = false; 585 bool uc = false;
574 int ow = e->oldSize().width(); 586 int ow = e->oldSize().width();
575 int oh = e->oldSize().height(); 587 int oh = e->oldSize().height();
576 int w = e->size().width(); 588 int w = e->size().width();
577 int h = e->size().height(); 589 int h = e->size().height();
578 if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) { 590 if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) {
579 if ( ! mBlockUpdating && !globalFlagBlockStartup && !globalFlagBlockAgenda ) 591 if ( ! mBlockUpdating && !globalFlagBlockStartup && !globalFlagBlockAgenda )
580 uc = true; 592 uc = true;
581 //qDebug("view changed %d %d %d %d ", ow, oh , w , h); 593 //qDebug("view changed %d %d %d %d ", ow, oh , w , h);
582 } 594 }
583 mUpcomingWidth = e->size().width() ; 595 mUpcomingWidth = e->size().width() ;
584 if ( mBlockUpdating || uc ) { 596 if ( mBlockUpdating || uc ) {
585 mBlockUpdating = false; 597 mBlockUpdating = false;
586 //mAgenda->setMinimumSize(800 , 600 ); 598 //mAgenda->setMinimumSize(800 , 600 );
587 //qDebug("mAgenda->resize+++++++++++++++ "); 599 //qDebug("mAgenda->resize+++++++++++++++ ");
588 updateConfig(); 600 updateConfig();
589 //qDebug("KOAgendaView::Updating now possible "); 601 //qDebug("KOAgendaView::Updating now possible ");
590 } else 602 } else
591 createDayLabels(); 603 createDayLabels();
592 //qDebug("resizeEvent end "); 604 //qDebug("resizeEvent end ");
593 605
594} 606}
595void KOAgendaView::slotDaylabelClicked( int num ) 607void KOAgendaView::slotDaylabelClicked( int num )
596{ 608{
597 609
598 QDate firstDate = mSelectedDates.first(); 610 QDate firstDate = mSelectedDates.first();
599 if ( num == -1 ) 611 if ( num == -1 )
600 emit showDateView( 6, firstDate ); 612 emit showDateView( 6, firstDate );
601 else if (num >= 0 ) { 613 else if (num >= 0 ) {
602 if ( mSelectedDates.count() == 1) 614 if ( mSelectedDates.count() == 1)
603 emit showDateView( 9, firstDate.addDays( num ) ); 615 emit showDateView( 9, firstDate.addDays( num ) );
604 else 616 else
605 emit showDateView( 3, firstDate.addDays( num ) ); 617 emit showDateView( 3, firstDate.addDays( num ) );
606 } 618 }
607 else 619 else
608 showDateView( 10, firstDate.addDays(1) ); 620 showDateView( 10, firstDate.addDays(1) );
609} 621}
610 622
611KOAgendaButton* KOAgendaView::getNewDaylabel() 623KOAgendaButton* KOAgendaView::getNewDaylabel()
612{ 624{
613 625
614 KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels); 626 KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels);
615 connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) ); 627 connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) );
616 mDayLabelsList.append( dayLabel ); 628 mDayLabelsList.append( dayLabel );
617 mLayoutDayLabels->addWidget(dayLabel); 629 mLayoutDayLabels->addWidget(dayLabel);
618 return dayLabel ; 630 return dayLabel ;
619} 631}
620 632
621void KOAgendaView::createDayLabels() 633void KOAgendaView::createDayLabels()
622{ 634{
623 635
624 if ( mBlockUpdating || globalFlagBlockLabel == 1) { 636 if ( mBlockUpdating || globalFlagBlockLabel == 1) {
625 // qDebug(" KOAgendaView::createDayLabels() blocked "); 637 // qDebug(" KOAgendaView::createDayLabels() blocked ");
626 return; 638 return;
627 639
628 } 640 }
629 int newHight; 641 int newHight;
630 642
631 // ### Before deleting and recreating we could check if mSelectedDates changed... 643 // ### Before deleting and recreating we could check if mSelectedDates changed...
632 // It would remove some flickering and gain speed (since this is called by 644 // It would remove some flickering and gain speed (since this is called by
633 // each updateView() call) 645 // each updateView() call)
634 646
635 int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2; 647 int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2;
636 mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); 648 mDayLabelsFrame->setMaximumWidth( mUpcomingWidth );
637 if ( maxWid < 0 ) 649 if ( maxWid < 0 )
638 maxWid = 20; 650 maxWid = 20;
639 651
640 QFont dlf = KOPrefs::instance()->mTimeLabelsFont; 652 QFont dlf = KOPrefs::instance()->mTimeLabelsFont;
641 QFontMetrics fm ( dlf ); 653 QFontMetrics fm ( dlf );
642 int selCount = mSelectedDates.count(); 654 int selCount = mSelectedDates.count();
643 QString dayTest = "Mon 20"; 655 QString dayTest = "Mon 20";
644 //QString dayTest = "Mon 20"; 656 //QString dayTest = "Mon 20";
645 int wid = fm.width( dayTest ); 657 int wid = fm.width( dayTest );
646 //maxWid -= ( selCount * 3 ); //working for QLabels 658 //maxWid -= ( selCount * 3 ); //working for QLabels
647 maxWid -= ( selCount * 3 ); //working for QPushButton 659 maxWid -= ( selCount * 3 ); //working for QPushButton
648 if ( maxWid < 0 ) 660 if ( maxWid < 0 )
649 maxWid = 20; 661 maxWid = 20;
650 int needWid = wid * selCount; 662 int needWid = wid * selCount;
651 //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); 663 //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid );
652 //if ( needWid > maxWid ) 664 //if ( needWid > maxWid )
653 // qDebug("DAYLABELS TOOOOOOO BIG "); 665 // qDebug("DAYLABELS TOOOOOOO BIG ");
654 while ( needWid > maxWid ) { 666 while ( needWid > maxWid ) {
655 dayTest = dayTest.left( dayTest.length() - 1 ); 667 dayTest = dayTest.left( dayTest.length() - 1 );
656 wid = fm.width( dayTest ); 668 wid = fm.width( dayTest );
657 needWid = wid * selCount; 669 needWid = wid * selCount;
658 } 670 }
659 int maxLen = dayTest.length(); 671 int maxLen = dayTest.length();
660 int fontPoint = dlf.pointSize(); 672 int fontPoint = dlf.pointSize();
661 if ( maxLen < 2 ) { 673 if ( maxLen < 2 ) {
662 int fontPoint = dlf.pointSize(); 674 int fontPoint = dlf.pointSize();
663 while ( fontPoint > 4 ) { 675 while ( fontPoint > 4 ) {
664 --fontPoint; 676 --fontPoint;
665 dlf.setPointSize( fontPoint ); 677 dlf.setPointSize( fontPoint );
666 QFontMetrics f( dlf ); 678 QFontMetrics f( dlf );
667 wid = f.width( "30" ); 679 wid = f.width( "30" );
668 needWid = wid * selCount; 680 needWid = wid * selCount;
669 if ( needWid < maxWid ) 681 if ( needWid < maxWid )
670 break; 682 break;
671 } 683 }
672 maxLen = 2; 684 maxLen = 2;
673 } 685 }
674 //qDebug("Max len %d ", dayTest.length() ); 686 //qDebug("Max len %d ", dayTest.length() );
675 687
676 QFontMetrics tempF( dlf ); 688 QFontMetrics tempF( dlf );
677 newHight = tempF.height(); 689 newHight = tempF.height();
678 mDayLabels->setFont( dlf ); 690 mDayLabels->setFont( dlf );
679 // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; 691 // mLayoutDayLabels = new QHBoxLayout(mDayLabels);;
680 // mLayoutDayLabels->addSpacing(mTimeLabels->width()); 692 // mLayoutDayLabels->addSpacing(mTimeLabels->width());
681 //mLayoutDayLabels->addSpacing( 2 ); 693 //mLayoutDayLabels->addSpacing( 2 );
682 // QFont lFont = dlf; 694 // QFont lFont = dlf;
683 bool appendLabels = false; 695 bool appendLabels = false;
684 KOAgendaButton *dayLabel; 696 KOAgendaButton *dayLabel;
685 dayLabel = mDayLabelsList.first(); 697 dayLabel = mDayLabelsList.first();
686 if ( !dayLabel ) { 698 if ( !dayLabel ) {
687 appendLabels = true; 699 appendLabels = true;
688 dayLabel = getNewDaylabel(); 700 dayLabel = getNewDaylabel();
689 } 701 }
690 dayLabel->setFixedWidth( mTimeLabels->width()+2 ); 702 dayLabel->setFixedWidth( mTimeLabels->width()+2 );
691 dayLabel->setFont( dlf ); 703 dayLabel->setFont( dlf );
692 dayLabel->setNum( -1 ); 704 dayLabel->setNum( -1 );
693 //dayLabel->setAlignment(QLabel::AlignHCenter); 705 //dayLabel->setAlignment(QLabel::AlignHCenter);
694 dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); 706 dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) );
695 dayLabel->show(); 707 dayLabel->show();
696 DateList::ConstIterator dit; 708 DateList::ConstIterator dit;
697 bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); 709 bool oneday = (mSelectedDates.first() == mSelectedDates.last() );
698 int counter = -1; 710 int counter = -1;
699 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { 711 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
700 ++counter; 712 ++counter;
701 QDate date = *dit; 713 QDate date = *dit;
702 // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); 714 // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels);
703 if ( ! appendLabels ) { 715 if ( ! appendLabels ) {
704 dayLabel = mDayLabelsList.next(); 716 dayLabel = mDayLabelsList.next();
705 if ( !dayLabel ) 717 if ( !dayLabel )
706 appendLabels = true; 718 appendLabels = true;
707 } 719 }
708 if ( appendLabels ) { 720 if ( appendLabels ) {
709 dayLabel = getNewDaylabel(); 721 dayLabel = getNewDaylabel();
710 } 722 }
711 dayLabel->setMinimumWidth( 1 ); 723 dayLabel->setMinimumWidth( 1 );
712 dayLabel->setMaximumWidth( 10240 ); 724 dayLabel->setMaximumWidth( 10240 );
713 dayLabel->setFont( dlf ); 725 dayLabel->setFont( dlf );
714 dayLabel->show(); 726 dayLabel->show();
715 dayLabel->setNum( counter ); 727 dayLabel->setNum( counter );
716 QString str; 728 QString str;
717 int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); 729 int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date);
718 QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); 730 QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true );
719 switch ( maxLen ) { 731 switch ( maxLen ) {
720 case 2: 732 case 2:
721 str = QString::number( date.day() ); 733 str = QString::number( date.day() );
722 break; 734 break;
723 735
724 case 3: 736 case 3:
725 str = dayName.left( 1 ) +QString::number( date.day()); 737 str = dayName.left( 1 ) +QString::number( date.day());
726 738
727 break; 739 break;
728 case 4: 740 case 4:
729 str = dayName.left( 1 ) + " " +QString::number( date.day()); 741 str = dayName.left( 1 ) + " " +QString::number( date.day());
730 742
731 break; 743 break;
732 case 5: 744 case 5:
733 str = dayName.left( 2 ) + " " +QString::number( date.day()); 745 str = dayName.left( 2 ) + " " +QString::number( date.day());
734 746
735 break; 747 break;
736 case 6: 748 case 6:
737 str = dayName.left( 3 ) + " " +QString::number( date.day()); 749 str = dayName.left( 3 ) + " " +QString::number( date.day());
738 break; 750 break;
739 751
740 default: 752 default:
741 break; 753 break;
742 } 754 }
743 if ( oneday ) { 755 if ( oneday ) {
744 QString addString; 756 QString addString;
745 if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) 757 if ( mSelectedDates.first() == QDateTime::currentDateTime().date() )
746 addString = i18n("Today"); 758 addString = i18n("Today");
747 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) 759 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) )
748 addString = i18n("Tomorrow"); 760 addString = i18n("Tomorrow");
749 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) 761 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) )
750 addString = i18n("Yesterday"); 762 addString = i18n("Yesterday");
751 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) 763 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) )
752 addString = i18n("Day before yesterday"); 764 addString = i18n("Day before yesterday");
753 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) 765 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) )
754 addString = i18n("Day after tomorrow"); 766 addString = i18n("Day after tomorrow");
755 if ( !addString.isEmpty() ) { 767 if ( !addString.isEmpty() ) {
756 str = addString+", " + str; 768 str = addString+", " + str;
757 } 769 }
758 } 770 }
759 dayLabel->setText(str); 771 dayLabel->setText(str);
760 //dayLabel->setAlignment(QLabel::AlignHCenter); 772 //dayLabel->setAlignment(QLabel::AlignHCenter);
761 if (date == QDate::currentDate()) { 773 if (date == QDate::currentDate()) {
762 QFont bFont = dlf; 774 QFont bFont = dlf;
763 bFont.setBold( true ); 775 bFont.setBold( true );
764 dayLabel->setFont(bFont); 776 dayLabel->setFont(bFont);
765 } 777 }
766 //dayLayout->addWidget(dayLabel); 778 //dayLayout->addWidget(dayLabel);
767 779
768#ifndef KORG_NOPLUGINS 780#ifndef KORG_NOPLUGINS
769 CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); 781 CalendarDecoration::List cds = KOCore::self()->calendarDecorations();
770 CalendarDecoration *it; 782 CalendarDecoration *it;
771 for(it = cds.first(); it; it = cds.next()) { 783 for(it = cds.first(); it; it = cds.next()) {
772 QString text = it->shortText( date ); 784 QString text = it->shortText( date );
773 if ( !text.isEmpty() ) { 785 if ( !text.isEmpty() ) {
774 QLabel *label = new QLabel(text,mDayLabels); 786 QLabel *label = new QLabel(text,mDayLabels);
775 label->setAlignment(AlignCenter); 787 label->setAlignment(AlignCenter);
776 dayLayout->addWidget(label); 788 dayLayout->addWidget(label);
777 } 789 }
778 } 790 }
779 791
780 for(it = cds.first(); it; it = cds.next()) { 792 for(it = cds.first(); it; it = cds.next()) {
781 QWidget *wid = it->smallWidget(mDayLabels,date); 793 QWidget *wid = it->smallWidget(mDayLabels,date);
782 if ( wid ) { 794 if ( wid ) {
783 // wid->setHeight(20); 795 // wid->setHeight(20);
784 dayLayout->addWidget(wid); 796 dayLayout->addWidget(wid);
785 } 797 }
786 } 798 }
787#endif 799#endif
788 } 800 }
789 if ( ! appendLabels ) { 801 if ( ! appendLabels ) {
790 dayLabel = mDayLabelsList.next(); 802 dayLabel = mDayLabelsList.next();
791 if ( !dayLabel ) 803 if ( !dayLabel )
792 appendLabels = true; 804 appendLabels = true;
793 } 805 }
794 if ( appendLabels ) { 806 if ( appendLabels ) {
795 dayLabel = getNewDaylabel(); 807 dayLabel = getNewDaylabel();
796 } 808 }
797 //dayLabel->hide();//test only 809 //dayLabel->hide();//test only
798 810
799 int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; 811 int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ;
800 if ( offset < 0 ) offset = 0; 812 if ( offset < 0 ) offset = 0;
801 //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); 813 //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 );
802 dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); 814 dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) );
803 dayLabel->setFont( dlf ); 815 dayLabel->setFont( dlf );
804 dayLabel->show(); 816 dayLabel->show();
805 dayLabel->setNum( -2 ); 817 dayLabel->setNum( -2 );
806 dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); 818 dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset );
807 //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); 819 //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2);
808 //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); 820 //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2);
809 if ( !appendLabels ) { 821 if ( !appendLabels ) {
810 dayLabel = mDayLabelsList.next(); 822 dayLabel = mDayLabelsList.next();
811 while ( dayLabel ) { 823 while ( dayLabel ) {
812 //qDebug("!dayLabel %d",dayLabel ); 824 //qDebug("!dayLabel %d",dayLabel );
813 dayLabel->hide(); 825 dayLabel->hide();
814 dayLabel = mDayLabelsList.next(); 826 dayLabel = mDayLabelsList.next();
815 } 827 }
816 } 828 }
817 //mDayLabelsFrame->show(); 829 //mDayLabelsFrame->show();
818 //mDayLabels->show(); 830 //mDayLabels->show();
819 //qDebug("heigt %d %d %d ",mDayLabelsFrame->height(), mDayLabelsFrame->sizeHint().height(), newHight); 831 //qDebug("heigt %d %d %d ",mDayLabelsFrame->height(), mDayLabelsFrame->sizeHint().height(), newHight);
820 //mDayLabelsFrame->resize( mAgenda->visibleWidth(), newHight ); 832 //mDayLabelsFrame->resize( mAgenda->visibleWidth(), newHight );
821 mDayLabelsFrame->setFixedHeight( newHight ); 833 mDayLabelsFrame->setFixedHeight( newHight );
822} 834}
823 835
824int KOAgendaView::maxDatesHint() 836int KOAgendaView::maxDatesHint()
825{ 837{
826 // Not sure about the max number of events, so return 0 for now. 838 // Not sure about the max number of events, so return 0 for now.
827 return 0; 839 return 0;
828} 840}
829 841
830int KOAgendaView::currentDateCount() 842int KOAgendaView::currentDateCount()
831{ 843{
832 return mSelectedDates.count(); 844 return mSelectedDates.count();
833} 845}
834 846
835QPtrList<Incidence> KOAgendaView::selectedIncidences() 847QPtrList<Incidence> KOAgendaView::selectedIncidences()
836{ 848{
837 QPtrList<Incidence> selected; 849 QPtrList<Incidence> selected;
838 Incidence *incidence; 850 Incidence *incidence;
839 851
840 incidence = mAgenda->selectedIncidence(); 852 incidence = mAgenda->selectedIncidence();
841 if (incidence) selected.append(incidence); 853 if (incidence) selected.append(incidence);
842 854
843 incidence = mAllDayAgenda->selectedIncidence(); 855 incidence = mAllDayAgenda->selectedIncidence();
844 if (incidence) selected.append(incidence); 856 if (incidence) selected.append(incidence);
845 857
846 return selected; 858 return selected;
847} 859}
848 860
849DateList KOAgendaView::selectedDates() 861DateList KOAgendaView::selectedDates()
850{ 862{
851 DateList selected; 863 DateList selected;
852 QDate qd; 864 QDate qd;
853 865
854 qd = mAgenda->selectedIncidenceDate(); 866 qd = mAgenda->selectedIncidenceDate();
855 if (qd.isValid()) selected.append(qd); 867 if (qd.isValid()) selected.append(qd);
856 868
857 qd = mAllDayAgenda->selectedIncidenceDate(); 869 qd = mAllDayAgenda->selectedIncidenceDate();
858 if (qd.isValid()) selected.append(qd); 870 if (qd.isValid()) selected.append(qd);
859 871
860 return selected; 872 return selected;
861} 873}
862 874
863 875
864void KOAgendaView::updateView() 876void KOAgendaView::updateView()
865{ 877{
866 if ( mBlockUpdating ) 878 if ( mBlockUpdating )
867 return; 879 return;
868 // kdDebug() << "KOAgendaView::updateView()" << endl; 880 // kdDebug() << "KOAgendaView::updateView()" << endl;
869 fillAgenda(); 881 fillAgenda();
870 882
871} 883}
872 884
873 885
874/* 886/*
875 Update configuration settings for the agenda view. This method is not 887 Update configuration settings for the agenda view. This method is not
876 complete. 888 complete.
877*/ 889*/
878void KOAgendaView::updateConfig() 890void KOAgendaView::updateConfig()
879{ 891{
880 if ( mBlockUpdating ) 892 if ( mBlockUpdating )
881 return; 893 return;
882 894
883
884
885 // update config for children 895 // update config for children
886 mTimeLabels->updateConfig(); 896 mTimeLabels->updateConfig();
887 mAgenda->storePosition(); 897 mAgenda->storePosition();
888 mAgenda->updateConfig(); 898 mAgenda->updateConfig();
889 mAllDayAgenda->updateConfig(); 899 mAllDayAgenda->updateConfig();
890 // widget synchronization 900 // widget synchronization
891 //TODO: find a better way, maybe signal/slot 901 //TODO: find a better way, maybe signal/slot
892 mTimeLabels->positionChanged(); 902 mTimeLabels->positionChanged();
893 903
894 // for some reason, this needs to be called explicitly 904 // for some reason, this needs to be called explicitly
895 mTimeLabels->repaint(); 905 mTimeLabels->repaint();
896 906
897 mDummyAllDayLeft->setFixedWidth(mTimeLabels->width()); 907 mDummyAllDayLeft->setFixedWidth(mTimeLabels->width());
898 908
899 // ToolTips displaying summary of events 909 // ToolTips displaying summary of events
900 KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance() 910 KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance()
901 ->mEnableToolTips); 911 ->mEnableToolTips);
902 912
903 //setHolidayMasks(); 913 //setHolidayMasks();
904 914
905 //createDayLabels(); called by via updateView(); 915 //createDayLabels(); called by via updateView();
906 mEventIndicatorTop->setXOffset(mTimeLabels->width() + mAgenda->frameWidth()); 916 mEventIndicatorTop->setXOffset(mTimeLabels->width() + mAgenda->frameWidth());
907 updateView(); 917 updateView();
908 mAgenda->restorePosition(); 918 mAgenda->restorePosition();
909} 919}
910 920
911 921
912void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) 922void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
913{ 923{
914 // kdDebug() << "KOAgendaView::updateEventDates(): " << item->text() << endl; 924 // kdDebug() << "KOAgendaView::updateEventDates(): " << item->text() << endl;
915 //qDebug("KOAgendaView::updateEventDates "); 925 //qDebug("KOAgendaView::updateEventDates ");
916 QDateTime startDt,endDt; 926 QDateTime startDt,endDt;
917 QDate startDate; 927 QDate startDate;
918 int lenInSecs; 928 int lenInSecs;
919 // if ( type == KOAgenda::RESIZETOP ) 929 // if ( type == KOAgenda::RESIZETOP )
920 // qDebug("RESIZETOP "); 930 // qDebug("RESIZETOP ");
921 // if ( type == KOAgenda::RESIZEBOTTOM ) 931 // if ( type == KOAgenda::RESIZEBOTTOM )
922 // qDebug("RESIZEBOTTOM "); 932 // qDebug("RESIZEBOTTOM ");
923 // if ( type == KOAgenda::MOVE ) 933 // if ( type == KOAgenda::MOVE )
924 // qDebug("MOVE "); 934 // qDebug("MOVE ");
925 if ( item->incidence()->type() == "Event" ) { 935 if ( item->incidence()->type() == "Event" ) {
926 startDt =item->incidence()->dtStart(); 936 startDt =item->incidence()->dtStart();
927 endDt = item->incidence()->dtEnd(); 937 endDt = item->incidence()->dtEnd();
928 lenInSecs = startDt.secsTo( endDt ); 938 lenInSecs = startDt.secsTo( endDt );
929 } 939 }
930 940
931 // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED ); 941 // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED );
932 942
933 if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) { 943 if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) {
934 startDate = mSelectedDates[item->mLastMoveXPos]; 944 startDate = mSelectedDates[item->mLastMoveXPos];
935 } else { 945 } else {
936 if (item->cellX() < 0) { 946 if (item->cellX() < 0) {
937 startDate = (mSelectedDates.first()).addDays(item->cellX()); 947 startDate = (mSelectedDates.first()).addDays(item->cellX());
938 } else { 948 } else {
939 startDate = mSelectedDates[item->cellX()]; 949 startDate = mSelectedDates[item->cellX()];
940 } 950 }
941 } 951 }
942 startDt.setDate(startDate); 952 startDt.setDate(startDate);
943 953
944 if (item->incidence()->doesFloat()) { 954 if (item->incidence()->doesFloat()) {
945 endDt.setDate(startDate.addDays(item->cellWidth() - 1)); 955 endDt.setDate(startDate.addDays(item->cellWidth() - 1));
946 } else { 956 } else {
947 if ( type == KOAgenda::RESIZETOP || type == KOAgenda::MOVE ) 957 if ( type == KOAgenda::RESIZETOP || type == KOAgenda::MOVE )
948 startDt.setTime(mAgenda->gyToTime(item->cellYTop())); 958 startDt.setTime(mAgenda->gyToTime(item->cellYTop()));
949 if ( item->incidence()->type() == "Event" ) { 959 if ( item->incidence()->type() == "Event" ) {
950 if ( type == KOAgenda::MOVE ) { 960 if ( type == KOAgenda::MOVE ) {
951 endDt = startDt.addSecs(lenInSecs); 961 endDt = startDt.addSecs(lenInSecs);
952 962
953 } else if ( type == KOAgenda::RESIZEBOTTOM ) { 963 } else if ( type == KOAgenda::RESIZEBOTTOM ) {
954 if (item->lastMultiItem()) { 964 if (item->lastMultiItem()) {
955 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); 965 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
956 endDt.setDate(startDate. 966 endDt.setDate(startDate.
957 addDays(item->lastMultiItem()->cellX() - item->cellX())); 967 addDays(item->lastMultiItem()->cellX() - item->cellX()));
958 } else { 968 } else {
959 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); 969 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
960 endDt.setDate(startDate); 970 endDt.setDate(startDate);
961 } 971 }
962 } 972 }
963 } else { 973 } else {
964 // todo 974 // todo
965 if (item->lastMultiItem()) { 975 if (item->lastMultiItem()) {
966 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); 976 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
967 endDt.setDate(startDate. 977 endDt.setDate(startDate.
968 addDays(item->lastMultiItem()->cellX() - item->cellX())); 978 addDays(item->lastMultiItem()->cellX() - item->cellX()));
969 } else { 979 } else {
970 //qDebug("tem->cellYBottom() %d",item->cellYBottom() ); 980 //qDebug("tem->cellYBottom() %d",item->cellYBottom() );
971 if ( item->cellYBottom() > 0 ) 981 if ( item->cellYBottom() > 0 )
972 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); 982 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
973 else 983 else
974 endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time()); 984 endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time());
975 endDt.setDate(startDate); 985 endDt.setDate(startDate);
976 } 986 }
977 } 987 }
978 } 988 }
979 if ( item->incidence()->type() == "Event" ) { 989 if ( item->incidence()->type() == "Event" ) {
980 item->incidence()->setDtStart(startDt); 990 item->incidence()->setDtStart(startDt);
981 (static_cast<Event*>(item->incidence()))->setDtEnd(endDt); 991 (static_cast<Event*>(item->incidence()))->setDtEnd(endDt);
982 } else if ( item->incidence()->type() == "Todo" ) { 992 } else if ( item->incidence()->type() == "Todo" ) {
983 Todo* to = static_cast<Todo*>(item->incidence()); 993 Todo* to = static_cast<Todo*>(item->incidence());
984 994
985 to->setDtDue(endDt); 995 to->setDtDue(endDt);
986 if ( to->hasStartDate() ) { 996 if ( to->hasStartDate() ) {
987 if (to->dtStart() >= to->dtDue() ) 997 if (to->dtStart() >= to->dtDue() )
988 to->setDtStart(to->dtDue().addDays( -2 )); 998 to->setDtStart(to->dtDue().addDays( -2 ));
989 } 999 }
990 1000
991 } 1001 }
992 //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() ); 1002 //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() );
993 item->incidence()->setRevision(item->incidence()->revision()+1); 1003 item->incidence()->setRevision(item->incidence()->revision()+1);
994 item->setItemDate(startDt.date()); 1004 item->setItemDate(startDt.date());
995 //item->updateItem(); 1005 //item->updateItem();
996 if ( item->incidence()->type() == "Todo" ) { 1006 if ( item->incidence()->type() == "Todo" ) {
997 emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED ); 1007 emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED );
998 1008
999 } 1009 }
1000 else 1010 else
1001 emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED); 1011 emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED);
1002 item->updateItem(); 1012 item->updateItem();
1003} 1013}
1004 1014
1005void KOAgendaView::showDates( const QDate &start, const QDate &end ) 1015void KOAgendaView::showDates( const QDate &start, const QDate &end )
1006{ 1016{
1007 // kdDebug() << "KOAgendaView::selectDates" << endl; 1017 // kdDebug() << "KOAgendaView::selectDates" << endl;
1008 1018
1009 mSelectedDates.clear(); 1019 mSelectedDates.clear();
1010 // qDebug("KOAgendaView::showDates "); 1020 // qDebug("KOAgendaView::showDates ");
1011 QDate d = start; 1021 QDate d = start;
1012 while (d <= end) { 1022 while (d <= end) {
1013 mSelectedDates.append(d); 1023 mSelectedDates.append(d);
1014 d = d.addDays( 1 ); 1024 d = d.addDays( 1 );
1015 } 1025 }
1016 1026
1017 // and update the view 1027 // and update the view
1018 fillAgenda(); 1028 fillAgenda();
1019} 1029}
1020 1030
1021 1031
1022void KOAgendaView::showEvents(QPtrList<Event>) 1032void KOAgendaView::showEvents(QPtrList<Event>)
1023{ 1033{
1024 kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl; 1034 kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl;
1025} 1035}
1026 1036
1027void KOAgendaView::changeEventDisplay(Event *, int) 1037void KOAgendaView::changeEventDisplay(Event *, int)
1028{ 1038{
1029 // qDebug("KOAgendaView::changeEventDisplay "); 1039 // qDebug("KOAgendaView::changeEventDisplay ");
1030 // kdDebug() << "KOAgendaView::changeEventDisplay" << endl; 1040 // kdDebug() << "KOAgendaView::changeEventDisplay" << endl;
1031 // this should be re-written to be MUCH smarter. Right now we 1041 // this should be re-written to be MUCH smarter. Right now we
1032 // are just playing dumb. 1042 // are just playing dumb.
1033 fillAgenda(); 1043 fillAgenda();
1034} 1044}
1035 1045
1036void KOAgendaView::fillAgenda(const QDate &) 1046void KOAgendaView::fillAgenda(const QDate &)
1037{ 1047{
1038 // qDebug("KOAgendaView::fillAgenda "); 1048 // qDebug("KOAgendaView::fillAgenda ");
1039 fillAgenda(); 1049 fillAgenda();
1040} 1050}
1041 1051
1042void KOAgendaView::fillAgenda() 1052void KOAgendaView::fillAgenda()
1043{ 1053{
1044 if ( globalFlagBlockStartup ) 1054 if ( globalFlagBlockStartup )
1045 return; 1055 return;
1046 if ( globalFlagBlockAgenda == 1 ) 1056 if ( globalFlagBlockAgenda == 1 )
1047 return; 1057 return;
1048 //if ( globalFlagBlockAgenda == 2 ) 1058 //if ( globalFlagBlockAgenda == 2 )
1049 //globalFlagBlockAgenda = 0; 1059 //globalFlagBlockAgenda = 0;
1050 // globalFlagBlockPainting = false; 1060 // globalFlagBlockPainting = false;
1051 if ( globalFlagBlockAgenda == 0 ) 1061 if ( globalFlagBlockAgenda == 0 )
1052 globalFlagBlockAgenda = 1; 1062 globalFlagBlockAgenda = 1;
1053 // clearView(); 1063 // clearView();
1054 //qDebug("fillAgenda()++++ "); 1064 //qDebug("fillAgenda()++++ ");
1055 globalFlagBlockAgendaItemPaint = 1; 1065 globalFlagBlockAgendaItemPaint = 1;
1056 1066
1057 mAllDayAgenda->changeColumns(mSelectedDates.count()); 1067 mAllDayAgenda->changeColumns(mSelectedDates.count());
1058 mAgenda->changeColumns(mSelectedDates.count()); 1068 mAgenda->changeColumns(mSelectedDates.count());
1059 qApp->processEvents(); 1069 qApp->processEvents();
1060 mEventIndicatorTop->changeColumns(mSelectedDates.count()); 1070 mEventIndicatorTop->changeColumns(mSelectedDates.count());
1061 mEventIndicatorBottom->changeColumns(mSelectedDates.count()); 1071 mEventIndicatorBottom->changeColumns(mSelectedDates.count());
1062 setHolidayMasks(); 1072 setHolidayMasks();
1063 1073
1064 //mAgenda->hideUnused(); 1074 //mAgenda->hideUnused();
1065 //mAllDayAgenda->hideUnused(); 1075 //mAllDayAgenda->hideUnused();
1066 1076
1067 // mAgenda->blockNextRepaint( false ); 1077 // mAgenda->blockNextRepaint( false );
1068 // mAgenda->viewport()->repaint(); 1078 // mAgenda->viewport()->repaint();
1069 // mAgenda->blockNextRepaint( true ); 1079 // mAgenda->blockNextRepaint( true );
1070 mMinY.resize(mSelectedDates.count()); 1080 mMinY.resize(mSelectedDates.count());
1071 mMaxY.resize(mSelectedDates.count()); 1081 mMaxY.resize(mSelectedDates.count());
1072 1082
1073 QPtrList<Event> dayEvents; 1083 QPtrList<Event> dayEvents;
1074 1084
1075 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. 1085 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
1076 // Therefore, gtodoset all of them. 1086 // Therefore, gtodoset all of them.
1077 QPtrList<Todo> todos = calendar()->todos(); 1087 QPtrList<Todo> todos = calendar()->todos();
1078 1088
1079 mAgenda->setDateList(mSelectedDates); 1089 mAgenda->setDateList(mSelectedDates);
1080 1090
1081 QDate today = QDate::currentDate(); 1091 QDate today = QDate::currentDate();
1082 1092
1083 DateList::ConstIterator dit; 1093 DateList::ConstIterator dit;
1084 int curCol = 0; 1094 int curCol = 0;
1085 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { 1095 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
1086 QDate currentDate = *dit; 1096 QDate currentDate = *dit;
1087 // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString() 1097 // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString()
1088 // << endl; 1098 // << endl;
1089 1099
1090 dayEvents = calendar()->events(currentDate,true); 1100 dayEvents = calendar()->events(currentDate,true);
1091 1101
1092 // Default values, which can never be reached 1102 // Default values, which can never be reached
1093 mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1; 1103 mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1;
1094 mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1; 1104 mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1;
1095 1105
1096 unsigned int numEvent; 1106 unsigned int numEvent;
1097 for(numEvent=0;numEvent<dayEvents.count();++numEvent) { 1107 for(numEvent=0;numEvent<dayEvents.count();++numEvent) {
1098 Event *event = dayEvents.at(numEvent); 1108 Event *event = dayEvents.at(numEvent);
1099 if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") ) 1109 if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") )
1100 if ( event->uid().left(15) == QString("last-syncEvent-") ) 1110 if ( event->uid().left(15) == QString("last-syncEvent-") )
1101 continue; 1111 continue;
1102 // kdDebug() << " Event: " << event->summary() << endl; 1112 // kdDebug() << " Event: " << event->summary() << endl;
1103 1113
1104 int beginX = currentDate.daysTo(event->dtStart().date()) + curCol; 1114 int beginX = currentDate.daysTo(event->dtStart().date()) + curCol;
1105 int endX = currentDate.daysTo(event->dtEnd().date()) + curCol; 1115 int endX = currentDate.daysTo(event->dtEnd().date()) + curCol;
1106 1116
1107 // kdDebug() << " beginX: " << beginX << " endX: " << endX << endl; 1117 // kdDebug() << " beginX: " << beginX << " endX: " << endX << endl;
1108 1118
1109 if (event->doesFloat()) { 1119 if (event->doesFloat()) {
1110 if (event->recurrence()->doesRecur()) { 1120 if (event->recurrence()->doesRecur()) {
1111 mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol); 1121 mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
1112 } else { 1122 } else {
1113 if (beginX <= 0 && curCol == 0) { 1123 if (beginX <= 0 && curCol == 0) {
1114 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); 1124 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
1115 } else if (beginX == curCol) { 1125 } else if (beginX == curCol) {
1116 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); 1126 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
1117 } 1127 }
1118 } 1128 }
1119 } else if (event->isMultiDay()) { 1129 } else if (event->isMultiDay()) {
1120 if ( event->doesRecur () ) { 1130 if ( event->doesRecur () ) {
1121 QDate dateit = currentDate; 1131 QDate dateit = currentDate;
1122 int count = 0; 1132 int count = 0;
1123 int max = event->dtStart().daysTo( event->dtEnd() ) +2; 1133 int max = event->dtStart().daysTo( event->dtEnd() ) +2;
1124 while (! event->recursOn( dateit ) && count <= max ) { 1134 while (! event->recursOn( dateit ) && count <= max ) {
1125 ++count; 1135 ++count;
1126 dateit = dateit.addDays( -1 ); 1136 dateit = dateit.addDays( -1 );
1127 } 1137 }
1128 bool ok; 1138 bool ok;
1129 QDateTime nextOcstart = event->getNextOccurence( QDateTime(dateit) ,&ok ); 1139 QDateTime nextOcstart = event->getNextOccurence( QDateTime(dateit) ,&ok );
1130 if ( ok ) 1140 if ( ok )
1131 { 1141 {
1132 int secs = event->dtStart().secsTo( event->dtEnd() ); 1142 int secs = event->dtStart().secsTo( event->dtEnd() );
1133 QDateTime nextOcend =nextOcstart.addSecs( secs ); ; 1143 QDateTime nextOcend =nextOcstart.addSecs( secs ); ;
1134 beginX = currentDate.daysTo(nextOcstart.date()) + curCol; 1144 beginX = currentDate.daysTo(nextOcstart.date()) + curCol;
1135 endX = currentDate.daysTo(nextOcend.date()) + curCol; 1145 endX = currentDate.daysTo(nextOcend.date()) + curCol;
1136 1146
1137 } 1147 }
1138 } 1148 }
1139 int startY = mAgenda->timeToY(event->dtStart().time()); 1149 int startY = mAgenda->timeToY(event->dtStart().time());
1140 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1; 1150 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1;
1141 //qDebug("insert %d %d %d %d %d ",beginX,endX,startY,endY , curCol ); 1151 //qDebug("insert %d %d %d %d %d ",beginX,endX,startY,endY , curCol );
1142 if ((beginX <= 0 && curCol == 0) || beginX == curCol) { 1152 if ((beginX <= 0 && curCol == 0) || beginX == curCol) {
1143 //qDebug("insert!!! "); 1153 //qDebug("insert!!! ");
1144 mAgenda->insertMultiItem(event,currentDate,beginX,endX,startY,endY); 1154 mAgenda->insertMultiItem(event,currentDate,beginX,endX,startY,endY);
1145 } 1155 }
1146 if (beginX == curCol) { 1156 if (beginX == curCol) {
1147 mMaxY[curCol] = mAgenda->timeToY(QTime(23,59)); 1157 mMaxY[curCol] = mAgenda->timeToY(QTime(23,59));
1148 if (startY < mMinY[curCol]) mMinY[curCol] = startY; 1158 if (startY < mMinY[curCol]) mMinY[curCol] = startY;
1149 } else if (endX == curCol) { 1159 } else if (endX == curCol) {
1150 mMinY[curCol] = mAgenda->timeToY(QTime(0,0)); 1160 mMinY[curCol] = mAgenda->timeToY(QTime(0,0));
1151 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; 1161 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
1152 } else { 1162 } else {
1153 mMinY[curCol] = mAgenda->timeToY(QTime(0,0)); 1163 mMinY[curCol] = mAgenda->timeToY(QTime(0,0));
1154 mMaxY[curCol] = mAgenda->timeToY(QTime(23,59)); 1164 mMaxY[curCol] = mAgenda->timeToY(QTime(23,59));
1155 } 1165 }
1156 } else { 1166 } else {
1157 int startY = mAgenda->timeToY(event->dtStart().time()); 1167 int startY = mAgenda->timeToY(event->dtStart().time());
1158 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1; 1168 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1;
1159 if (endY < startY) endY = startY; 1169 if (endY < startY) endY = startY;
1160 mAgenda->insertItem(event,currentDate,curCol,startY,endY); 1170 mAgenda->insertItem(event,currentDate,curCol,startY,endY);
1161 if (startY < mMinY[curCol]) mMinY[curCol] = startY; 1171 if (startY < mMinY[curCol]) mMinY[curCol] = startY;
1162 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; 1172 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
1163 } 1173 }
1164 } 1174 }
1165 // ---------- [display Todos -------------- 1175 // ---------- [display Todos --------------
1166 unsigned int numTodo; 1176 unsigned int numTodo;
1167 for (numTodo = 0; numTodo < todos.count(); ++numTodo) { 1177 for (numTodo = 0; numTodo < todos.count(); ++numTodo) {
1168 Todo *todo = todos.at(numTodo); 1178 Todo *todo = todos.at(numTodo);
1169 1179
1170 if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue; // todo shall not be displayed if it has no date 1180 if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue; // todo shall not be displayed if it has no date
1171 1181
1172 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. 1182 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
1173 // Already completed items can be displayed on their original due date 1183 // Already completed items can be displayed on their original due date
1174 //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda 1184 //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda
1175 bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda; 1185 bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda;
1176 bool fillIn = false; 1186 bool fillIn = false;
1177 if ( todo->hasCompletedDate() && todo->completed().date() == currentDate ) 1187 if ( todo->hasCompletedDate() && todo->completed().date() == currentDate )
1178 fillIn = true; 1188 fillIn = true;
1179 if ( ! fillIn && !todo->hasCompletedDate() ) 1189 if ( ! fillIn && !todo->hasCompletedDate() )
1180 fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue); 1190 fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue);
1181 if ( fillIn ) { 1191 if ( fillIn ) {
1182 if ( (todo->doesFloat() || overdue ) && !todo->hasCompletedDate() ) { // Todo has no due-time set or is already overdue 1192 if ( (todo->doesFloat() || overdue ) && !todo->hasCompletedDate() ) { // Todo has no due-time set or is already overdue
1183 if ( KOPrefs::instance()->mShowTodoInAgenda ) 1193 if ( KOPrefs::instance()->mShowTodoInAgenda )
1184 mAllDayAgenda->insertAllDayItem(todo, currentDate, curCol, curCol); 1194 mAllDayAgenda->insertAllDayItem(todo, currentDate, curCol, curCol);
1185 } 1195 }
1186 else { 1196 else {
1187 QDateTime dt; 1197 QDateTime dt;
1188 if ( todo->hasCompletedDate() ) 1198 if ( todo->hasCompletedDate() )
1189 dt = todo->completed(); 1199 dt = todo->completed();
1190 else 1200 else
1191 dt = todo->dtDue();; 1201 dt = todo->dtDue();;
1192 1202
1193 1203
1194 int endY = mAgenda->timeToY(dt.time()) - 1; 1204 int endY = mAgenda->timeToY(dt.time()) - 1;
1195 int hi = (18/KOPrefs::instance()->mHourSize); 1205 int hi = (18/KOPrefs::instance()->mHourSize);
1196 //qDebug("hei %d ",KOPrefs::instance()->mHourSize); 1206 //qDebug("hei %d ",KOPrefs::instance()->mHourSize);
1197 int startY = endY -hi; 1207 int startY = endY -hi;
1198 1208
1199 mAgenda->insertItem(todo,currentDate,curCol,startY,endY); 1209 mAgenda->insertItem(todo,currentDate,curCol,startY,endY);
1200 1210
1201 if (startY < mMinY[curCol]) mMinY[curCol] = startY; 1211 if (startY < mMinY[curCol]) mMinY[curCol] = startY;
1202 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; 1212 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
1203 } 1213 }
1204 } 1214 }
1205 } 1215 }
1206 // ---------- display Todos] -------------- 1216 // ---------- display Todos] --------------
1207 1217
1208 ++curCol; 1218 ++curCol;
1209 } 1219 }
1210 mAgenda->hideUnused(); 1220 mAgenda->hideUnused();
1211 mAllDayAgenda->hideUnused(); 1221 mAllDayAgenda->hideUnused();
1212 mAgenda->checkScrollBoundaries(); 1222 mAgenda->checkScrollBoundaries();
1213 1223
1214 deleteSelectedDateTime(); 1224 deleteSelectedDateTime();
1215 1225
1216 createDayLabels(); 1226 createDayLabels();
1217 emit incidenceSelected( 0 ); 1227 emit incidenceSelected( 0 );
1218 1228
1219 if ( globalFlagBlockAgenda == 2 ) { 1229 if ( globalFlagBlockAgenda == 2 ) {
1220 if ( KOPrefs::instance()->mSetTimeToDayStartAt ) 1230 if ( KOPrefs::instance()->mSetTimeToDayStartAt )
1221 setStartHour( KOPrefs::instance()->mDayBegins ); 1231 setStartHour( KOPrefs::instance()->mDayBegins );
1222 else if ( KOPrefs::instance()->mCenterOnCurrentTime ) 1232 else if ( KOPrefs::instance()->mCenterOnCurrentTime )
1223 setStartHour( QTime::currentTime ().hour() ); 1233 setStartHour( QTime::currentTime ().hour() );
1224 // qApp->processEvents(); 1234 // qApp->processEvents();
1225 } 1235 }
1226 qApp->processEvents(); 1236 qApp->processEvents();
1227 //qDebug("qApp->processEvents(); END "); 1237 //qDebug("qApp->processEvents(); END ");
1228 globalFlagBlockAgenda = 0; 1238 globalFlagBlockAgenda = 0;
1229 1239
1230 // mAgenda->hideUnused(); 1240 // mAgenda->hideUnused();
1231 //mAllDayAgenda->hideUnused(); 1241 //mAllDayAgenda->hideUnused();
1232 mAllDayAgenda->drawContentsToPainter(); 1242 mAllDayAgenda->drawContentsToPainter();
1233 mAgenda->drawContentsToPainter(); 1243 mAgenda->drawContentsToPainter();
1234 repaintAgenda(); 1244 repaintAgenda();
1235 // mAgenda->finishUpdate(); 1245 // mAgenda->finishUpdate();
1236 //mAllDayAgenda->finishUpdate(); 1246 //mAllDayAgenda->finishUpdate();
1237 1247
1238 // repaintAgenda(); 1248 // repaintAgenda();
1239 //qApp->processEvents(); 1249 //qApp->processEvents();
1240 // globalFlagBlockAgenda = 0; 1250 // globalFlagBlockAgenda = 0;
1241} 1251}
1242void KOAgendaView::repaintAgenda() 1252void KOAgendaView::repaintAgenda()
1243{ 1253{
1244 // mAllDayAgenda->drawContentsToPainter(); 1254 // mAllDayAgenda->drawContentsToPainter();
1245// mAllDayAgenda->viewport()->repaint( false ); 1255// mAllDayAgenda->viewport()->repaint( false );
1246// mAgenda->drawContentsToPainter(); 1256// mAgenda->drawContentsToPainter();
1247// mAgenda->viewport()->repaint( false ); 1257// mAgenda->viewport()->repaint( false );
1248// qApp->processEvents(); 1258// qApp->processEvents();
1249 1259
1250 //qDebug("KOAgendaView::repaintAgenda() "); 1260 //qDebug("KOAgendaView::repaintAgenda() ");
1251 //qApp->processEvents(); 1261 //qApp->processEvents();
1252 mAgenda->viewport()->repaint( false ); 1262 mAgenda->viewport()->repaint( false );
1253 mAllDayAgenda->viewport()->repaint( false ); 1263 mAllDayAgenda->viewport()->repaint( false );
1254 mAgenda->finishUpdate(); 1264 mAgenda->finishUpdate();
1255 mAllDayAgenda->finishUpdate(); 1265 mAllDayAgenda->finishUpdate();
1256} 1266}
1257 1267
1258 1268
1259void KOAgendaView::clearView() 1269void KOAgendaView::clearView()
1260{ 1270{
1261 // kdDebug() << "ClearView" << endl; 1271 // kdDebug() << "ClearView" << endl;
1262 mAllDayAgenda->clear(); 1272 mAllDayAgenda->clear();
1263 mAgenda->clear(); 1273 mAgenda->clear();
1264} 1274}
1265 1275
1266void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd, 1276void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd,
1267 const QDate &td) 1277 const QDate &td)
1268{ 1278{
1269#ifndef KORG_NOPRINTER 1279#ifndef KORG_NOPRINTER
1270 if (fd == td) 1280 if (fd == td)
1271 calPrinter->preview(CalPrinter::Day, fd, td); 1281 calPrinter->preview(CalPrinter::Day, fd, td);
1272 else 1282 else
1273 calPrinter->preview(CalPrinter::Week, fd, td); 1283 calPrinter->preview(CalPrinter::Week, fd, td);
1274#endif 1284#endif
1275} 1285}
1276 1286
1277// void KOAgendaView::updateMovedTodo() 1287// void KOAgendaView::updateMovedTodo()
1278// { 1288// {
1279// // updateConfig(); 1289// // updateConfig();
1280// // emit updateTodoViews(); 1290// // emit updateTodoViews();
1281// } 1291// }
1282 1292
1283void KOAgendaView::newEvent(int gx, int gy) 1293void KOAgendaView::newEvent(int gx, int gy)
1284{ 1294{
1285 if (!mSelectedDates.count()) return; 1295 if (!mSelectedDates.count()) return;
1286 1296
1287 QDate day = mSelectedDates[gx]; 1297 QDate day = mSelectedDates[gx];
1288 1298
1289 QTime time = mAgenda->gyToTime(gy); 1299 QTime time = mAgenda->gyToTime(gy);
1290 QDateTime dt(day,time); 1300 QDateTime dt(day,time);
1291 // if ( dt < QDateTime::currentDateTime () ) 1301 // if ( dt < QDateTime::currentDateTime () )
1292 // dt = QDateTime::currentDateTime ().addSecs( 3600 ); 1302 // dt = QDateTime::currentDateTime ().addSecs( 3600 );
1293 emit newEventSignal(dt); 1303 emit newEventSignal(dt);
1294} 1304}
1295 1305
1296void KOAgendaView::newEvent(int gxStart, int gyStart, int gxEnd, int gyEnd) 1306void KOAgendaView::newEvent(int gxStart, int gyStart, int gxEnd, int gyEnd)
1297{ 1307{
1298 if (!mSelectedDates.count()) return; 1308 if (!mSelectedDates.count()) return;
1299 1309
1300 QDate dayStart = mSelectedDates[gxStart]; 1310 QDate dayStart = mSelectedDates[gxStart];
1301 QDate dayEnd = mSelectedDates[gxEnd]; 1311 QDate dayEnd = mSelectedDates[gxEnd];
1302 1312
1303 QTime timeStart = mAgenda->gyToTime(gyStart); 1313 QTime timeStart = mAgenda->gyToTime(gyStart);
1304 QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 ); 1314 QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 );
1305 1315
1306 QDateTime dtStart(dayStart,timeStart); 1316 QDateTime dtStart(dayStart,timeStart);
1307 QDateTime dtEnd(dayEnd,timeEnd); 1317 QDateTime dtEnd(dayEnd,timeEnd);
1308 1318
1309 emit newEventSignal(dtStart,dtEnd); 1319 emit newEventSignal(dtStart,dtEnd);
1310} 1320}
1311 1321
1312void KOAgendaView::newEventAllDay(int gx, int ) 1322void KOAgendaView::newEventAllDay(int gx, int )
1313{ 1323{
1314 if (!mSelectedDates.count()) return; 1324 if (!mSelectedDates.count()) return;
1315 1325
1316 QDate day = mSelectedDates[gx]; 1326 QDate day = mSelectedDates[gx];
1317 1327
1318 emit newEventSignal(day); 1328 emit newEventSignal(day);
1319} 1329}
1320void KOAgendaView::newTodoAllDay(int gx, int ) 1330void KOAgendaView::newTodoAllDay(int gx, int )
1321{ 1331{
1322 if (!mSelectedDates.count()) return; 1332 if (!mSelectedDates.count()) return;
1323 1333
1324 QDateTime day (mSelectedDates[gx] ); 1334 QDateTime day (mSelectedDates[gx] );
1325 emit newTodoSignal(day, true); 1335 emit newTodoSignal(day, true);
1326} 1336}
1327void KOAgendaView::newTodo(int gx, int gy ) 1337void KOAgendaView::newTodo(int gx, int gy )
1328{ 1338{
1329 if (!mSelectedDates.count()) return; 1339 if (!mSelectedDates.count()) return;
1330 QDate dayStart = mSelectedDates[gx]; 1340 QDate dayStart = mSelectedDates[gx];
1331 QTime timeStart = mAgenda->gyToTime(gy); 1341 QTime timeStart = mAgenda->gyToTime(gy);
1332 QDateTime dt (dayStart,timeStart); 1342 QDateTime dt (dayStart,timeStart);
1333 emit newTodoSignal( dt, false ); 1343 emit newTodoSignal( dt, false );
1334} 1344}
1335 1345
1336void KOAgendaView::updateEventIndicatorTop(int newY) 1346void KOAgendaView::updateEventIndicatorTop(int newY)
1337{ 1347{
1338 uint i; 1348 uint i;
1339 for(i=0;i<mMinY.size();++i) { 1349 for(i=0;i<mMinY.size();++i) {
1340 if (newY >= mMinY.at(i)) mEventIndicatorTop->enableColumn(i,true); 1350 if (newY >= mMinY.at(i)) mEventIndicatorTop->enableColumn(i,true);
1341 else mEventIndicatorTop->enableColumn(i,false); 1351 else mEventIndicatorTop->enableColumn(i,false);
1342 } 1352 }
1343 1353
1344 mEventIndicatorTop->update(); 1354 mEventIndicatorTop->update();
1345} 1355}
1346 1356
1347void KOAgendaView::updateEventIndicatorBottom(int newY) 1357void KOAgendaView::updateEventIndicatorBottom(int newY)
1348{ 1358{
1349 uint i; 1359 uint i;
1350 for(i=0;i<mMaxY.size();++i) { 1360 for(i=0;i<mMaxY.size();++i) {
1351 if (newY <= mMaxY.at(i)) mEventIndicatorBottom->enableColumn(i,true); 1361 if (newY <= mMaxY.at(i)) mEventIndicatorBottom->enableColumn(i,true);
1352 else mEventIndicatorBottom->enableColumn(i,false); 1362 else mEventIndicatorBottom->enableColumn(i,false);
1353 } 1363 }
1354 1364
1355 mEventIndicatorBottom->update(); 1365 mEventIndicatorBottom->update();
1356} 1366}
1357 1367
1358void KOAgendaView::startDrag(Event *event) 1368void KOAgendaView::startDrag(Event *event)
1359{ 1369{
1360#ifndef KORG_NODND 1370#ifndef KORG_NODND
1361 DndFactory factory( calendar() ); 1371 DndFactory factory( calendar() );
1362 ICalDrag *vd = factory.createDrag(event,this); 1372 ICalDrag *vd = factory.createDrag(event,this);
1363 if (vd->drag()) { 1373 if (vd->drag()) {
1364 kdDebug() << "KOAgendaView::startDrag(): Delete drag source" << endl; 1374 kdDebug() << "KOAgendaView::startDrag(): Delete drag source" << endl;
1365 } 1375 }
1366#endif 1376#endif
1367} 1377}
1368 1378
1369void KOAgendaView::readSettings() 1379void KOAgendaView::readSettings()
1370{ 1380{
1371 readSettings(KOGlobals::config()); 1381 readSettings(KOGlobals::config());
1372} 1382}
1373 1383
1374void KOAgendaView::readSettings(KConfig *config) 1384void KOAgendaView::readSettings(KConfig *config)
1375{ 1385{
1376 // kdDebug() << "KOAgendaView::readSettings()" << endl; 1386 // kdDebug() << "KOAgendaView::readSettings()" << endl;
1377 1387
1378 config->setGroup("Views"); 1388 config->setGroup("Views");
1379 1389
1380 //#ifndef KORG_NOSPLITTER 1390 //#ifndef KORG_NOSPLITTER
1381 QValueList<int> sizes = config->readIntListEntry("Separator AgendaView"); 1391 QValueList<int> sizes = config->readIntListEntry("Separator AgendaView");
1382 if (sizes.count() == 2) { 1392 if (sizes.count() == 2) {
1383 if ( sizes[0] < 20 ) { 1393 if ( sizes[0] < 20 ) {
1384 sizes[1] = sizes[1] +20 - sizes[0]; 1394 sizes[1] = sizes[1] +20 - sizes[0];
1385 sizes[0] = 20; 1395 sizes[0] = 20;
1386 } 1396 }
1387 mSplitterAgenda->setSizes(sizes); 1397 mSplitterAgenda->setSizes(sizes);
1388 // qDebug("read %d %d ",sizes[0],sizes[1] ); 1398 // qDebug("read %d %d ",sizes[0],sizes[1] );
1389 } 1399 }
1390 //#endif 1400 //#endif
1391 1401
1392 // updateConfig(); 1402 // updateConfig();
1393} 1403}
1394 1404
1395void KOAgendaView::writeSettings(KConfig *config) 1405void KOAgendaView::writeSettings(KConfig *config)
1396{ 1406{
1397 // kdDebug() << "KOAgendaView::writeSettings()" << endl; 1407 // kdDebug() << "KOAgendaView::writeSettings()" << endl;
1398 1408
1399 config->setGroup("Views"); 1409 config->setGroup("Views");
1400 1410
1401 //#ifndef KORG_NOSPLITTER 1411 //#ifndef KORG_NOSPLITTER
1402 QValueList<int> list = mSplitterAgenda->sizes(); 1412 QValueList<int> list = mSplitterAgenda->sizes();
1403 config->writeEntry("Separator AgendaView",list); 1413 config->writeEntry("Separator AgendaView",list);
1404 //qDebug("write %d %d ", list[0],list[1] ); 1414 //qDebug("write %d %d ", list[0],list[1] );
1405 //#endif 1415 //#endif
1406} 1416}
1407 1417
1408void KOAgendaView::setHolidayMasks() 1418void KOAgendaView::setHolidayMasks()
1409{ 1419{
1410 mHolidayMask.resize(mSelectedDates.count()); 1420 mHolidayMask.resize(mSelectedDates.count());
1411 1421
1412 uint i; 1422 uint i;
1413 for(i=0;i<mSelectedDates.count();++i) { 1423 for(i=0;i<mSelectedDates.count();++i) {
1414 QDate date = mSelectedDates[i]; 1424 QDate date = mSelectedDates[i];
1415 bool showSaturday = KOPrefs::instance()->mExcludeSaturdays && (date.dayOfWeek() == 6); 1425 bool showSaturday = KOPrefs::instance()->mExcludeSaturdays && (date.dayOfWeek() == 6);
1416 bool showSunday = KOPrefs::instance()->mExcludeHolidays && (date.dayOfWeek() == 7); 1426 bool showSunday = KOPrefs::instance()->mExcludeHolidays && (date.dayOfWeek() == 7);
1417 bool showHoliday = false; 1427 bool showHoliday = false;
1418 if ( KOPrefs::instance()->mExcludeHolidays ) { 1428 if ( KOPrefs::instance()->mExcludeHolidays ) {
1419 QPtrList<Event> events = calendar()->events( date, true ); 1429 QPtrList<Event> events = calendar()->events( date, true );
1420 Event *event; 1430 Event *event;
1421 for( event = events.first(); event; event = events.next() ) { 1431 for( event = events.first(); event; event = events.next() ) {
1422 if ( event->isHoliday()) { 1432 if ( event->isHoliday()) {
1423 showHoliday = true; 1433 showHoliday = true;
1424 break; 1434 break;
1425 } 1435 }
1426 } 1436 }
1427 1437
1428 } 1438 }
1429 1439
1430#ifndef KORG_NOPLUGINS 1440#ifndef KORG_NOPLUGINS
1431 bool showHoliday = KOPrefs::instance()->mExcludeHolidays && 1441 bool showHoliday = KOPrefs::instance()->mExcludeHolidays &&
1432 !KOCore::self()->holiday(date).isEmpty(); 1442 !KOCore::self()->holiday(date).isEmpty();
1433#endif 1443#endif
1434 bool showDay = showSaturday || showSunday || showHoliday; 1444 bool showDay = showSaturday || showSunday || showHoliday;
1435 1445
1436 if (showDay) { 1446 if (showDay) {
1437 mHolidayMask.at(i) = true; 1447 mHolidayMask.at(i) = true;
1438 } else { 1448 } else {
1439 mHolidayMask.at(i) = false; 1449 mHolidayMask.at(i) = false;
1440 } 1450 }
1441 } 1451 }
1442 1452
1443 mAgenda->setHolidayMask(&mHolidayMask); 1453 mAgenda->setHolidayMask(&mHolidayMask);
1444 mAllDayAgenda->setHolidayMask(&mHolidayMask); 1454 mAllDayAgenda->setHolidayMask(&mHolidayMask);
1445} 1455}
1446 1456
1447void KOAgendaView::setContentsPos(int y) 1457void KOAgendaView::setContentsPos(int y)
1448{ 1458{
1449 mAgenda->setContentsPos(0,y); 1459 mAgenda->setContentsPos(0,y);
1450} 1460}
1451 1461
1452void KOAgendaView::setExpandedButton( bool expanded ) 1462void KOAgendaView::setExpandedButton( bool expanded )
1453{ 1463{
1454 if ( expanded ) { 1464 if ( expanded ) {
1455 mExpandButton->setPixmap( mExpandedPixmap ); 1465 mExpandButton->setPixmap( mExpandedPixmap );
1456 } else { 1466 } else {
1457 mExpandButton->setPixmap( mNotExpandedPixmap ); 1467 mExpandButton->setPixmap( mNotExpandedPixmap );
1458 } 1468 }
1459} 1469}
1460 1470
1461void KOAgendaView::clearSelection() 1471void KOAgendaView::clearSelection()
1462{ 1472{
1463 mAgenda->deselectItem(); 1473 mAgenda->deselectItem();
1464 mAllDayAgenda->deselectItem(); 1474 mAllDayAgenda->deselectItem();
1465} 1475}
1466 1476
1467void KOAgendaView::newTimeSpanSelectedAllDay(int gxStart, int gyStart, 1477void KOAgendaView::newTimeSpanSelectedAllDay(int gxStart, int gyStart,
1468 int gxEnd, int gyEnd) 1478 int gxEnd, int gyEnd)
1469{ 1479{
1470 mTimeSpanInAllDay = true; 1480 mTimeSpanInAllDay = true;
1471 newTimeSpanSelected(gxStart,gyStart,gxEnd,gyEnd); 1481 newTimeSpanSelected(gxStart,gyStart,gxEnd,gyEnd);
1472} 1482}
1473 1483
1474 1484
1475 1485
1476 1486
1477void KOAgendaView::newTimeSpanSelected(int gxStart, int gyStart, 1487void KOAgendaView::newTimeSpanSelected(int gxStart, int gyStart,
1478 int gxEnd, int gyEnd) 1488 int gxEnd, int gyEnd)
1479{ 1489{
1480 if (!mSelectedDates.count()) return; 1490 if (!mSelectedDates.count()) return;
1481 1491
1482 QDate dayStart = mSelectedDates[gxStart]; 1492 QDate dayStart = mSelectedDates[gxStart];
1483 QDate dayEnd = mSelectedDates[gxEnd]; 1493 QDate dayEnd = mSelectedDates[gxEnd];
1484 1494
1485 QTime timeStart = mAgenda->gyToTime(gyStart); 1495 QTime timeStart = mAgenda->gyToTime(gyStart);
1486 QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 ); 1496 QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 );
1487 1497
1488 QDateTime dtStart(dayStart,timeStart); 1498 QDateTime dtStart(dayStart,timeStart);
1489 QDateTime dtEnd(dayEnd,timeEnd); 1499 QDateTime dtEnd(dayEnd,timeEnd);
1490 1500
1491 mTimeSpanBegin = dtStart; 1501 mTimeSpanBegin = dtStart;
1492 mTimeSpanEnd = dtEnd; 1502 mTimeSpanEnd = dtEnd;
1493 1503
1494} 1504}
1495 1505
1496void KOAgendaView::deleteSelectedDateTime() 1506void KOAgendaView::deleteSelectedDateTime()
1497{ 1507{
1498 mTimeSpanBegin.setDate(QDate()); 1508 mTimeSpanBegin.setDate(QDate());
1499 mTimeSpanEnd.setDate(QDate()); 1509 mTimeSpanEnd.setDate(QDate());
1500 mTimeSpanInAllDay = false; 1510 mTimeSpanInAllDay = false;
1501} 1511}
1502 1512
1503void KOAgendaView::keyPressEvent ( QKeyEvent * e ) 1513void KOAgendaView::keyPressEvent ( QKeyEvent * e )
1504{ 1514{
1505 e->ignore(); 1515 e->ignore();
1506} 1516}
1507 1517
1508void KOAgendaView::scrollOneHourUp() 1518void KOAgendaView::scrollOneHourUp()
1509{ 1519{
1510 1520
1511 mAgenda->scrollBy ( 0, -mAgenda->contentsHeight () / 24 ); 1521 mAgenda->scrollBy ( 0, -mAgenda->contentsHeight () / 24 );
1512} 1522}
1513void KOAgendaView::scrollOneHourDown() 1523void KOAgendaView::scrollOneHourDown()
1514{ 1524{
1515 mAgenda->scrollBy ( 0, mAgenda->contentsHeight () / 24 ); 1525 mAgenda->scrollBy ( 0, mAgenda->contentsHeight () / 24 );
1516} 1526}
1517 1527
1518void KOAgendaView::setStartHour( int h ) 1528void KOAgendaView::setStartHour( int h )
1519{ 1529{
1520 mAgenda->setStartHour( h ); 1530 mAgenda->setStartHour( h );
1521 1531
1522} 1532}
1523void KOAgendaView::setInitStartHour() 1533void KOAgendaView::setInitStartHour()
1524{ 1534{
1525 1535
1526 if ( KOPrefs::instance()->mCenterOnCurrentTime ) 1536 if ( KOPrefs::instance()->mCenterOnCurrentTime )
1527 setStartHour( QTime::currentTime ().hour() ); 1537 setStartHour( QTime::currentTime ().hour() );
1528 else 1538 else
1529 setStartHour( KOPrefs::instance()->mDayBegins ); 1539 setStartHour( KOPrefs::instance()->mDayBegins );
1530 1540
1531} 1541}
1532 1542
1533 1543
1534void KOAgendaView::updateTodo( Todo * t, int ) 1544void KOAgendaView::updateTodo( Todo * t, int )
1535{ 1545{
1536 if ( !isVisible() ) 1546 if ( !isVisible() )
1537 return; 1547 return;
1538 bool remove = false; 1548 bool remove = false;
1539 bool removeAD = false; 1549 bool removeAD = false;
1540 QDate da; 1550 QDate da;
1541 if ( t->hasCompletedDate() ) 1551 if ( t->hasCompletedDate() )
1542 da = t->completed().date(); 1552 da = t->completed().date();
1543 else 1553 else
1544 da = t->dtDue().date(); 1554 da = t->dtDue().date();
1545 if ( ! t->hasDueDate() && !t->hasCompletedDate() ) { 1555 if ( ! t->hasDueDate() && !t->hasCompletedDate() ) {
1546 remove = true; 1556 remove = true;
1547 removeAD = true; 1557 removeAD = true;
1548 } 1558 }
1549 else { 1559 else {
1550 bool overdue = (!t->isCompleted()) && (t->dtDue() < QDate::currentDate()) && KOPrefs::instance()->mShowTodoInAgenda ; 1560 bool overdue = (!t->isCompleted()) && (t->dtDue() < QDate::currentDate()) && KOPrefs::instance()->mShowTodoInAgenda ;
1551 if ( overdue && 1561 if ( overdue &&
1552 QDate::currentDate() >= mSelectedDates.first() && 1562 QDate::currentDate() >= mSelectedDates.first() &&
1553 QDate::currentDate() <= mSelectedDates.last()) { 1563 QDate::currentDate() <= mSelectedDates.last()) {
1554 removeAD = false; 1564 removeAD = false;
1555 remove = true; 1565 remove = true;
1556 } 1566 }
1557 else { 1567 else {
1558 1568
1559 if ( da < mSelectedDates.first() || 1569 if ( da < mSelectedDates.first() ||
1560 da > mSelectedDates.last() ) { 1570 da > mSelectedDates.last() ) {
1561 remove = true; 1571 remove = true;
1562 removeAD = true; 1572 removeAD = true;
1563 } else { 1573 } else {
1564 remove = t->doesFloat() && !t->hasCompletedDate(); 1574 remove = t->doesFloat() && !t->hasCompletedDate();
1565 removeAD = !remove; 1575 removeAD = !remove;
1566 } 1576 }
1567 } 1577 }
1568 } 1578 }
1569 int days = mSelectedDates.first().daysTo( da ); 1579 int days = mSelectedDates.first().daysTo( da );
1570 //qDebug("daysto %d %d %d", days, remove,removeAD ); 1580 //qDebug("daysto %d %d %d", days, remove,removeAD );
1571 mAgenda->updateTodo( t , days, remove); 1581 mAgenda->updateTodo( t , days, remove);
1572 if ( KOPrefs::instance()->mShowTodoInAgenda ) 1582 if ( KOPrefs::instance()->mShowTodoInAgenda )
1573 mAllDayAgenda->updateTodo( t , days, removeAD); 1583 mAllDayAgenda->updateTodo( t , days, removeAD);
1574 //qDebug("KOAgendaView::updateTodo( Todo *, int ) "); 1584 //qDebug("KOAgendaView::updateTodo( Todo *, int ) ");
1575 1585
1576} 1586}
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 4ee5292..cf0d4ae 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -1,526 +1,512 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 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 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22*/ 22*/
23 23
24#include <qwidget.h> 24#include <qwidget.h>
25#include <qtooltip.h> 25#include <qtooltip.h>
26#include <qlayout.h> 26#include <qlayout.h>
27#include <qvbox.h> 27#include <qvbox.h>
28#include <qbuttongroup.h> 28#include <qbuttongroup.h>
29#include <qvgroupbox.h> 29#include <qvgroupbox.h>
30#include <qwidgetstack.h> 30#include <qwidgetstack.h>
31#include <qdatetime.h> 31#include <qdatetime.h>
32#include <qfile.h> 32#include <qfile.h>
33 33
34 34
35#include <kglobal.h> 35#include <kglobal.h>
36#include <kdebug.h> 36#include <kdebug.h>
37#include <klocale.h> 37#include <klocale.h>
38#include <kiconloader.h> 38#include <kiconloader.h>
39#include <kmessagebox.h> 39#include <kmessagebox.h>
40#include <kfiledialog.h> 40#include <kfiledialog.h>
41#include <kstandarddirs.h> 41#include <kstandarddirs.h>
42 42
43#include <libkcal/todo.h> 43#include <libkcal/todo.h>
44#include <libkcal/event.h> 44#include <libkcal/event.h>
45#include <libkdepim/categoryselectdialog.h> 45#include <libkdepim/categoryselectdialog.h>
46#include <libkdepim/kdateedit.h> 46#include <libkdepim/kdateedit.h>
47 47
48#include "koprefs.h" 48#include "koprefs.h"
49#include "koglobals.h" 49#include "koglobals.h"
50 50
51#include "koeditorgeneral.h" 51#include "koeditorgeneral.h"
52#include "kolocationbox.h" 52#include "kolocationbox.h"
53#ifndef DESKTOP_VERSION 53#ifndef DESKTOP_VERSION
54#include <qpe/qpeapplication.h> 54#include <qpe/qpeapplication.h>
55#else 55#else
56#include <qapplication.h> 56#include <qapplication.h>
57#endif 57#endif
58 58
59KOEditorGeneral::KOEditorGeneral(QObject* parent, const char* name) : 59KOEditorGeneral::KOEditorGeneral(QObject* parent, const char* name) :
60 QObject( parent, name) 60 QObject( parent, name)
61{ 61{
62} 62}
63 63
64KOEditorGeneral::~KOEditorGeneral() 64KOEditorGeneral::~KOEditorGeneral()
65{ 65{
66} 66}
67 67
68void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) 68void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
69{ 69{
70 QGridLayout *headerLayout = new QGridLayout(topLayout); 70 QGridLayout *headerLayout = new QGridLayout(topLayout);
71 71
72#if 0 72#if 0
73 mOwnerLabel = new QLabel(i18n("Owner:"),parent); 73 mOwnerLabel = new QLabel(i18n("Owner:"),parent);
74 headerLayout->addMultiCellWidget(mOwnerLabel,0,0,0,1); 74 headerLayout->addMultiCellWidget(mOwnerLabel,0,0,0,1);
75#endif 75#endif
76 76
77 QLabel *summaryLabel = new QLabel(i18n("Summary:"),parent); 77 QLabel *summaryLabel = new QLabel(i18n("Summary:"),parent);
78 headerLayout->addWidget(summaryLabel,1,0); 78 headerLayout->addWidget(summaryLabel,1,0);
79 79
80 mSummaryEdit = new KOLocationBox(TRUE,parent, 10); 80 mSummaryEdit = new KOLocationBox(TRUE,parent, 10);
81 mSummaryEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); 81 mSummaryEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) );
82 //mSummaryEdit->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5 ,(QSizePolicy::SizeType)3 ,FALSE) ); 82 //mSummaryEdit->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5 ,(QSizePolicy::SizeType)3 ,FALSE) );
83 //qDebug("h %d %d ", summaryLabel->sizeHint().height(),mSummaryEdit->sizeHint().height() ); 83 //qDebug("h %d %d ", summaryLabel->sizeHint().height(),mSummaryEdit->sizeHint().height() );
84 int hei = (summaryLabel->sizeHint().height() + mSummaryEdit->sizeHint().height())/2; 84 int hei = (summaryLabel->sizeHint().height() + mSummaryEdit->sizeHint().height())/2;
85 if ( QApplication::desktop()->width() > 320 ) 85 if ( QApplication::desktop()->width() > 320 )
86 mSummaryEdit->setMaximumHeight( hei +6 ); 86 mSummaryEdit->setMaximumHeight( hei +6 );
87 //qDebug("%d %d %d %d %d %d ", QSizePolicy::Fixed , QSizePolicy::Minimum , QSizePolicy:: Maximum , QSizePolicy:: Preferred , QSizePolicy:: MinimumExpanding , QSizePolicy::Expanding ); 87 //qDebug("%d %d %d %d %d %d ", QSizePolicy::Fixed , QSizePolicy::Minimum , QSizePolicy:: Maximum , QSizePolicy:: Preferred , QSizePolicy:: MinimumExpanding , QSizePolicy::Expanding );
88 // SizeType { Fixed = 0, Minimum = MayGrow, Maximum = MayShrink, Preferred = MayGrow|MayShrink, MinimumExpanding = Minimum|ExpMask, Expanding = MinimumExpanding|MayShrink } 88 // SizeType { Fixed = 0, Minimum = MayGrow, Maximum = MayShrink, Preferred = MayGrow|MayShrink, MinimumExpanding = Minimum|ExpMask, Expanding = MinimumExpanding|MayShrink }
89 // mSummaryEdit = new QLineEdit(parent); 89 // mSummaryEdit = new QLineEdit(parent);
90 headerLayout->addWidget(mSummaryEdit,1,1); 90 headerLayout->addWidget(mSummaryEdit,1,1);
91 connect ( mSummaryEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) ); 91 connect ( mSummaryEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) );
92 92
93 QLabel *locationLabel = new QLabel(i18n("Location:"),parent); 93 QLabel *locationLabel = new QLabel(i18n("Location:"),parent);
94 headerLayout->addWidget(locationLabel,2,0); 94 headerLayout->addWidget(locationLabel,2,0);
95 95
96 mLocationEdit = new KOLocationBox(TRUE,parent,10); 96 mLocationEdit = new KOLocationBox(TRUE,parent,10);
97 mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); 97 mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) );
98 if ( QApplication::desktop()->width() > 320 ) 98 if ( QApplication::desktop()->width() > 320 )
99 mLocationEdit->setMaximumHeight( hei + 6); 99 mLocationEdit->setMaximumHeight( hei + 6);
100 100
101 // mLocationEdit = new QLineEdit(parent); 101 // mLocationEdit = new QLineEdit(parent);
102 connect ( mLocationEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) ); 102 connect ( mLocationEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) );
103 headerLayout->addWidget(mLocationEdit,2,1); 103 headerLayout->addWidget(mLocationEdit,2,1);
104 headerLayout->setColStretch( 1, 10); 104 headerLayout->setColStretch( 1, 10);
105} 105}
106void KOEditorGeneral::setFocusOn( int i ) 106void KOEditorGeneral::setFocusOn( int i )
107{ 107{
108 qApp->processEvents(); 108 qApp->processEvents();
109 if ( i == 1 ) { 109 if ( i == 1 ) {
110 mDescriptionEdit->setFocus(); 110 mDescriptionEdit->setFocus();
111 mDescriptionEdit->setCursorPosition( mDescriptionEdit->numLines (), 333); 111 mDescriptionEdit->setCursorPosition( mDescriptionEdit->numLines (), 333);
112 } 112 }
113 if ( i == 2 ) { 113 if ( i == 2 ) {
114 mSummaryEdit->setFocus(); 114 mSummaryEdit->setFocus();
115 } 115 }
116 116
117} 117}
118void KOEditorGeneral::editCategories() 118void KOEditorGeneral::editCategories()
119{ 119{
120 // qDebug("KOEditorGeneral::editCategories() "); 120 // qDebug("KOEditorGeneral::editCategories() ");
121 KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 ); 121 KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 );
122 connect(csd,SIGNAL(categoriesSelected(const QString &)), this ,SLOT(setCategories(const QString &))); 122 connect(csd,SIGNAL(categoriesSelected(const QString &)), this ,SLOT(setCategories(const QString &)));
123 //KOGlobals::fitDialogToScreen( csd ); 123 //KOGlobals::fitDialogToScreen( csd );
124 csd->setColorEnabled(); 124 csd->setColorEnabled();
125 csd->setSelected( QStringList::split (",", mCategoriesLabel->text()) ); 125 csd->setSelected( QStringList::split (",", mCategoriesLabel->text()) );
126 csd->exec(); 126 csd->exec();
127 delete csd; 127 delete csd;
128} 128}
129void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout) 129void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
130{ 130{
131 QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout ); 131 QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout );
132 132
133 mCategoriesButton = new QPushButton(parent); 133 mCategoriesButton = new QPushButton(parent);
134 mCategoriesButton->setText(i18n("Categories...")); 134 mCategoriesButton->setText(i18n("Categories..."));
135 connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() )); 135 connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() ));
136 categoriesLayout->addWidget(mCategoriesButton); 136 categoriesLayout->addWidget(mCategoriesButton);
137 137
138 mCategoriesLabel = new QLabel(parent); 138 mCategoriesLabel = new QLabel(parent);
139 mCategoriesLabel->setFrameStyle(QFrame::Panel|QFrame::Sunken); 139 mCategoriesLabel->setFrameStyle(QFrame::Panel|QFrame::Sunken);
140 categoriesLayout->addWidget(mCategoriesLabel,1); 140 categoriesLayout->addWidget(mCategoriesLabel,1);
141} 141}
142 142
143void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout) 143void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout)
144{ 144{
145 QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout ); 145 QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout );
146 146
147 QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent); 147 QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent);
148 mCancelBox = new QCheckBox ( i18n("Cancelled"), parent); 148 mCancelBox = new QCheckBox ( i18n("Cancelled"), parent);
149 secrecyLayout->addWidget(mCancelBox); 149 secrecyLayout->addWidget(mCancelBox);
150 secrecyLayout->addWidget(secrecyLabel); 150 secrecyLayout->addWidget(secrecyLabel);
151 151
152 mSecrecyCombo = new QComboBox(parent); 152 mSecrecyCombo = new QComboBox(parent);
153 mSecrecyCombo->insertStringList(Incidence::secrecyList()); 153 mSecrecyCombo->insertStringList(Incidence::secrecyList());
154 secrecyLayout->addWidget(mSecrecyCombo); 154 secrecyLayout->addWidget(mSecrecyCombo);
155} 155}
156 156
157void KOEditorGeneral::initDescription(QWidget *parent,QBoxLayout *topLayout) 157void KOEditorGeneral::initDescription(QWidget *parent,QBoxLayout *topLayout)
158{ 158{
159 mDescriptionEdit = new KTextEdit(parent); 159 mDescriptionEdit = new KTextEdit(parent);
160 mDescriptionEdit->setFont(KOPrefs::instance()->mEditBoxFont ); 160 mDescriptionEdit->setFont(KOPrefs::instance()->mEditBoxFont );
161 mDescriptionEdit->append(""); 161 mDescriptionEdit->append("");
162 mDescriptionEdit->setReadOnly(false); 162 mDescriptionEdit->setReadOnly(false);
163 mDescriptionEdit->setOverwriteMode(false); 163 mDescriptionEdit->setOverwriteMode(false);
164 mDescriptionEdit->setWordWrap( KTextEdit::WidgetWidth ); 164 mDescriptionEdit->setWordWrap( KTextEdit::WidgetWidth );
165 topLayout->addWidget(mDescriptionEdit); 165 topLayout->addWidget(mDescriptionEdit);
166#ifndef DESKTOP_VERSION 166#ifndef DESKTOP_VERSION
167 QPEApplication::setStylusOperation( mDescriptionEdit, QPEApplication::RightOnHold ); 167 QPEApplication::setStylusOperation( mDescriptionEdit, QPEApplication::RightOnHold );
168#endif 168#endif
169 169
170} 170}
171 171
172void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout) 172void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout)
173{ 173{
174 QBoxLayout *alarmLayout = new QHBoxLayout(topLayout); 174 QBoxLayout *alarmLayout = new QHBoxLayout(topLayout);
175 175
176 //mAlarmBell = new QLabel(parent); 176 //mAlarmBell = new QLabel(parent);
177 //mAlarmBell->setPixmap(SmallIcon("bell")); 177 //mAlarmBell->setPixmap(SmallIcon("bell"));
178 //alarmLayout->addWidget(mAlarmBell); 178 //alarmLayout->addWidget(mAlarmBell);
179 if ( QApplication::desktop()->width() < 320 ) 179 if ( QApplication::desktop()->width() < 320 )
180 mAlarmButton = new QCheckBox(i18n("Rem."),parent); 180 mAlarmButton = new QCheckBox(i18n("Rem."),parent);
181 else 181 else
182 mAlarmButton = new QCheckBox(i18n("Reminder:"),parent); 182 mAlarmButton = new QCheckBox(i18n("Reminder:"),parent);
183 183
184 connect(mAlarmButton, SIGNAL(toggled(bool)), SLOT(enableAlarmEdit(bool))); 184 connect(mAlarmButton, SIGNAL(toggled(bool)), SLOT(enableAlarmEdit(bool)));
185 alarmLayout->addWidget(mAlarmButton); 185 alarmLayout->addWidget(mAlarmButton);
186 186
187 mAlarmTimeEdit = new QSpinBox ( 0, 9999, 1, parent, "mAlarmTimeEdit " ) ; 187 mAlarmTimeEdit = new QSpinBox ( 0, 9999, 1, parent, "mAlarmTimeEdit " ) ;
188 alarmLayout->addWidget(mAlarmTimeEdit); 188 alarmLayout->addWidget(mAlarmTimeEdit);
189 mAlarmIncrCombo = new QComboBox(false, parent); 189 mAlarmIncrCombo = new QComboBox(false, parent);
190 if ( QApplication::desktop()->width() < 320 ) { 190 if ( QApplication::desktop()->width() < 320 ) {
191 mAlarmIncrCombo->insertItem(i18n("min")); 191 mAlarmIncrCombo->insertItem(i18n("min"));
192 mAlarmIncrCombo->insertItem(i18n("hou")); 192 mAlarmIncrCombo->insertItem(i18n("hou"));
193 mAlarmIncrCombo->insertItem(i18n("day")); 193 mAlarmIncrCombo->insertItem(i18n("day"));
194 mAlarmTimeEdit->setMaximumWidth( mAlarmTimeEdit->sizeHint().width() ); 194 mAlarmTimeEdit->setMaximumWidth( mAlarmTimeEdit->sizeHint().width() );
195 mAlarmIncrCombo->setMaximumWidth( mAlarmIncrCombo->sizeHint().width() ); 195 mAlarmIncrCombo->setMaximumWidth( mAlarmIncrCombo->sizeHint().width() );
196 } else { 196 } else {
197 mAlarmIncrCombo->insertItem(i18n("minute(s)")); 197 mAlarmIncrCombo->insertItem(i18n("minute(s)"));
198 mAlarmIncrCombo->insertItem(i18n("hour(s)")); 198 mAlarmIncrCombo->insertItem(i18n("hour(s)"));
199 mAlarmIncrCombo->insertItem(i18n("day(s)")); 199 mAlarmIncrCombo->insertItem(i18n("day(s)"));
200 } 200 }
201 201
202 // mAlarmIncrCombo->setMinimumHeight(20); 202 // mAlarmIncrCombo->setMinimumHeight(20);
203 alarmLayout->addWidget(mAlarmIncrCombo); 203 alarmLayout->addWidget(mAlarmIncrCombo);
204 mAlarmSoundButton = new QPushButton(parent); 204 mAlarmSoundButton = new QPushButton(parent);
205 mAlarmSoundButton->setPixmap(SmallIcon("playsound")); 205 mAlarmSoundButton->setPixmap(SmallIcon("playsound"));
206 mAlarmSoundButton->setToggleButton(true); 206 mAlarmSoundButton->setToggleButton(true);
207 QToolTip::add(mAlarmSoundButton, i18n("No sound set")); 207 QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
208 connect(mAlarmSoundButton, SIGNAL(clicked()), SLOT(pickAlarmSound())); 208 connect(mAlarmSoundButton, SIGNAL(clicked()), SLOT(pickAlarmSound()));
209 alarmLayout->addWidget(mAlarmSoundButton); 209 alarmLayout->addWidget(mAlarmSoundButton);
210 210
211 mAlarmProgramButton = new QPushButton(parent); 211 mAlarmProgramButton = new QPushButton(parent);
212 mAlarmProgramButton->setPixmap(SmallIcon("run")); 212 mAlarmProgramButton->setPixmap(SmallIcon("run"));
213 mAlarmProgramButton->setToggleButton(true); 213 mAlarmProgramButton->setToggleButton(true);
214 QToolTip::add(mAlarmProgramButton, i18n("No program set")); 214 QToolTip::add(mAlarmProgramButton, i18n("No program set"));
215 connect(mAlarmProgramButton, SIGNAL(clicked()), SLOT(pickAlarmProgram())); 215 connect(mAlarmProgramButton, SIGNAL(clicked()), SLOT(pickAlarmProgram()));
216 alarmLayout->addWidget(mAlarmProgramButton); 216 alarmLayout->addWidget(mAlarmProgramButton);
217 mAlarmSoundButton->setMaximumWidth( mAlarmSoundButton->sizeHint().width() + 4 ); 217 mAlarmSoundButton->setMaximumWidth( mAlarmSoundButton->sizeHint().width() + 4 );
218 mAlarmProgramButton->setMaximumWidth(mAlarmProgramButton->sizeHint().width() + 4 ); 218 mAlarmProgramButton->setMaximumWidth(mAlarmProgramButton->sizeHint().width() + 4 );
219 // if ( KOPrefs::instance()->mCompactDialogs ) { 219 // if ( KOPrefs::instance()->mCompactDialogs ) {
220 // mAlarmSoundButton->hide(); 220 // mAlarmSoundButton->hide();
221 // mAlarmProgramButton->hide(); 221 // mAlarmProgramButton->hide();
222 // } 222 // }
223} 223}
224 224
225void KOEditorGeneral::pickAlarmSound() 225void KOEditorGeneral::pickAlarmSound()
226{ 226{
227 227
228 qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() ); 228 qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() );
229 //QString prefix = mAlarmSound; 229 //QString prefix = mAlarmSound;
230 if (!mAlarmSoundButton->isOn()) { 230 if (!mAlarmSoundButton->isOn()) {
231 //mAlarmSound = ""; 231 mAlarmSoundButton->setOn(true);
232 QToolTip::remove(mAlarmSoundButton); 232 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
233 QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
234 mAlarmProgramButton->setOn(true);
235 mAlarmSoundButton->setOn(false);
236 pickAlarmProgram();
237 } else { 233 } else {
238 QString fileName(KFileDialog::getOpenFileName(mAlarmSound, 234 QString fileName(KFileDialog::getOpenFileName(mAlarmSound,
239 i18n("*.wav|Wav Files"), 0)); 235 i18n("*.wav|Wav Files"), 0));
240 if (!fileName.isEmpty()) { 236 if (!fileName.isEmpty()) {
241 mAlarmSound = fileName; 237 mAlarmSound = fileName;
242 QToolTip::remove(mAlarmSoundButton); 238 QToolTip::remove(mAlarmSoundButton);
243 QString dispStr = i18n("Playing '%1'").arg(fileName); 239 QString dispStr = i18n("Playing '%1'").arg(fileName);
244 QToolTip::add(mAlarmSoundButton, dispStr); 240 QToolTip::add(mAlarmSoundButton, dispStr);
245 mAlarmProgramButton->setOn(false); 241 mAlarmProgramButton->setOn(false);
246 mAlarmSoundButton->setOn(true); 242 mAlarmSoundButton->setOn(true);
247 } else { 243 } else {
248 mAlarmProgramButton->setOn(true); 244 mAlarmProgramButton->setOn(true);
249 mAlarmSoundButton->setOn(false); 245 mAlarmSoundButton->setOn(false);
250 246
251 } 247 }
252 } 248 }
253 249#if 0
254 if (mAlarmProgramButton->isOn()) 250 if (mAlarmProgramButton->isOn())
255 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) ); 251 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
256 if ( mAlarmSoundButton->isOn()) 252 if ( mAlarmSoundButton->isOn())
257 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); 253 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
254#endif
258} 255}
259 256
260void KOEditorGeneral::pickAlarmProgram() 257void KOEditorGeneral::pickAlarmProgram()
261{ 258{
262 if (!mAlarmProgramButton->isOn()) { 259 if (!mAlarmProgramButton->isOn()) {
263 //mAlarmProgram = ""; 260 mAlarmProgramButton->setOn(true);
264 QToolTip::remove(mAlarmProgramButton); 261 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
265 QToolTip::add(mAlarmProgramButton, i18n("No program set"));
266 mAlarmProgramButton->setOn(false);
267 mAlarmSoundButton->setOn(true);
268 pickAlarmSound();
269 } else { 262 } else {
270 QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm: ") , 0)); 263 QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm: ") , 0));
271 if (!fileName.isEmpty()) { 264 if (!fileName.isEmpty()) {
272 mAlarmProgram = fileName; 265 mAlarmProgram = fileName;
273 QToolTip::remove(mAlarmProgramButton); 266 QToolTip::remove(mAlarmProgramButton);
274 QString dispStr = i18n("Running '%1'").arg(fileName); 267 QString dispStr = i18n("Running '%1'").arg(fileName);
275 QToolTip::add(mAlarmProgramButton, dispStr); 268 QToolTip::add(mAlarmProgramButton, dispStr);
276 mAlarmSoundButton->setOn(false); 269 mAlarmSoundButton->setOn(false);
277 mAlarmProgramButton->setOn(true); 270 mAlarmProgramButton->setOn(true);
278 } else { 271 } else {
279 mAlarmProgramButton->setOn(false); 272 mAlarmProgramButton->setOn(false);
280 mAlarmSoundButton->setOn(true); 273 mAlarmSoundButton->setOn(true);
281 } 274 }
282 } 275 }
276#if 0
283 if (mAlarmProgramButton->isOn()) 277 if (mAlarmProgramButton->isOn())
284 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) ); 278 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
285 if ( mAlarmSoundButton->isOn()) 279 if ( mAlarmSoundButton->isOn())
286 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); 280 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
281#endif
287} 282}
288 283
289 284
290QString KOEditorGeneral::getFittingPath( const QString s ) 285QString KOEditorGeneral::getFittingPath( const QString s )
291{ 286{
292 int maxlen = 50; 287 int maxlen = 50;
293 if ( QApplication::desktop()->width() < 640 ) { 288 if ( QApplication::desktop()->width() < 640 ) {
294 if ( QApplication::desktop()->width() < 320 ) 289 if ( QApplication::desktop()->width() < 320 )
295 maxlen = 22; 290 maxlen = 22;
296 else 291 else
297 maxlen = 35; 292 maxlen = 35;
298 } 293 }
299 if ( s.length() > maxlen ) { 294 if ( s.length() > maxlen ) {
300 return "..."+s.right(maxlen -3); 295 return "..."+s.right(maxlen -3);
301 } 296 }
302 return s; 297 return s;
303} 298}
304 299
305void KOEditorGeneral::enableAlarmEdit(bool enable) 300void KOEditorGeneral::enableAlarmEdit(bool enable)
306{ 301{
307 if ( enable ) { 302 if ( enable ) {
308 if (!mAlarmProgramButton->isOn() && !mAlarmSoundButton->isOn()) { 303 if (!mAlarmProgramButton->isOn() && !mAlarmSoundButton->isOn()) {
309 mAlarmSoundButton->setOn( true ); 304 mAlarmSoundButton->setOn( true );
310 if ( mAlarmSound.isEmpty() ) 305 if ( mAlarmSound.isEmpty() )
311 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile; 306 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
312 else { 307 else {
313 if ( ! QFile::exists( mAlarmSound ) ) 308 if ( ! QFile::exists( mAlarmSound ) )
314 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile; 309 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
315 } 310 }
316 } 311 }
317 if (mAlarmProgramButton->isOn())
318 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
319 if (!mAlarmSound.isEmpty() && mAlarmSoundButton->isOn())
320 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
321 }
322 else {
323 ((QWidget*)parent())->topLevelWidget()->setCaption(mAlarmMessage);
324 //((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Edit item: ") + mSummaryEdit->currentText());
325
326
327 } 312 }
313 ((QWidget*)parent())->topLevelWidget()->setCaption(mAlarmMessage);
328 mAlarmTimeEdit->setEnabled(enable); 314 mAlarmTimeEdit->setEnabled(enable);
329 mAlarmSoundButton->setEnabled(enable); 315 mAlarmSoundButton->setEnabled(enable);
330 mAlarmProgramButton->setEnabled(enable); 316 mAlarmProgramButton->setEnabled(enable);
331 mAlarmIncrCombo->setEnabled(enable); 317 mAlarmIncrCombo->setEnabled(enable);
332} 318}
333 319
334void KOEditorGeneral::disableAlarmEdit(bool disable) 320void KOEditorGeneral::disableAlarmEdit(bool disable)
335{ 321{
336 enableAlarmEdit( !disable ); 322 enableAlarmEdit( !disable );
337} 323}
338 324
339void KOEditorGeneral::enableAlarm( bool enable ) 325void KOEditorGeneral::enableAlarm( bool enable )
340{ 326{
341 enableAlarmEdit( enable ); 327 enableAlarmEdit( enable );
342} 328}
343 329
344void KOEditorGeneral::alarmDisable(bool disable) 330void KOEditorGeneral::alarmDisable(bool disable)
345{ 331{
346 if (!disable) { 332 if (!disable) {
347 //mAlarmBell->setEnabled(true); 333 //mAlarmBell->setEnabled(true);
348 mAlarmButton->setEnabled(true); 334 mAlarmButton->setEnabled(true);
349 } else { 335 } else {
350 //mAlarmBell->setEnabled(false); 336 //mAlarmBell->setEnabled(false);
351 mAlarmButton->setEnabled(false); 337 mAlarmButton->setEnabled(false);
352 mAlarmButton->setChecked(false); 338 mAlarmButton->setChecked(false);
353 mAlarmTimeEdit->setEnabled(false); 339 mAlarmTimeEdit->setEnabled(false);
354 mAlarmSoundButton->setEnabled(false); 340 mAlarmSoundButton->setEnabled(false);
355 mAlarmProgramButton->setEnabled(false); 341 mAlarmProgramButton->setEnabled(false);
356 mAlarmIncrCombo->setEnabled(false); 342 mAlarmIncrCombo->setEnabled(false);
357 } 343 }
358} 344}
359 345
360void KOEditorGeneral::setCategories(const QString &str) 346void KOEditorGeneral::setCategories(const QString &str)
361{ 347{
362 mCategoriesLabel->setText(str); 348 mCategoriesLabel->setText(str);
363} 349}
364 350
365void KOEditorGeneral::setDefaults(bool allDay) 351void KOEditorGeneral::setDefaults(bool allDay)
366{ 352{
367#if 0 353#if 0
368 mOwnerLabel->setText(i18n("Owner: ") + KOPrefs::instance()->fullName()); 354 mOwnerLabel->setText(i18n("Owner: ") + KOPrefs::instance()->fullName());
369#endif 355#endif
370 356
371 mAlarmMessage = i18n("Edit new item"); 357 mAlarmMessage = i18n("Edit new item");
372 enableAlarmEdit( !allDay ); 358 enableAlarmEdit( !allDay );
373 359
374 // TODO: Implement a KPrefsComboItem to solve this in a clean way. 360 // TODO: Implement a KPrefsComboItem to solve this in a clean way.
375 int alarmTime; 361 int alarmTime;
376 int a[] = { 1,5,10,15,30,60,180, 1440 }; 362 int a[] = { 1,5,10,15,30,60,180, 1440 };
377 int index = KOPrefs::instance()->mAlarmTime; 363 int index = KOPrefs::instance()->mAlarmTime;
378 if (index < 0 || index > 7) { 364 if (index < 0 || index > 7) {
379 alarmTime = 15; 365 alarmTime = 15;
380 } else { 366 } else {
381 alarmTime = a[index]; 367 alarmTime = a[index];
382 } 368 }
383 mAlarmButton ->setChecked( false ); 369 mAlarmButton ->setChecked( false );
384 mAlarmTimeEdit->setValue(alarmTime); 370 mAlarmTimeEdit->setValue(alarmTime);
385 mAlarmIncrCombo->setCurrentItem(0); 371 mAlarmIncrCombo->setCurrentItem(0);
386 enableAlarmEdit( false ); 372 enableAlarmEdit( false );
387 //alarmDisable (false); 373 //alarmDisable (false);
388 mSecrecyCombo->setCurrentItem(Incidence::SecrecyPublic); 374 mSecrecyCombo->setCurrentItem(Incidence::SecrecyPublic);
389 mCancelBox->setChecked( false ); 375 mCancelBox->setChecked( false );
390 mSummaryEdit->setEditText(""); 376 mSummaryEdit->setEditText("");
391 mLocationEdit->setEditText(""); 377 mLocationEdit->setEditText("");
392 mDescriptionEdit->setText(""); 378 mDescriptionEdit->setText("");
393 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile; 379 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
394 setCategories(""); 380 setCategories("");
395} 381}
396void KOEditorGeneral::setSecrecy( int num ) 382void KOEditorGeneral::setSecrecy( int num )
397{ 383{
398 mSecrecyCombo->setCurrentItem(num); 384 mSecrecyCombo->setCurrentItem(num);
399} 385}
400void KOEditorGeneral::readIncidence(Incidence *event) 386void KOEditorGeneral::readIncidence(Incidence *event)
401{ 387{
402 388
403 mAlarmMessage = i18n("Edit") +" "+event->summary(); 389 mAlarmMessage = event->summary();
404 mAlarmIncrCombo->setCurrentItem(0); 390 mAlarmIncrCombo->setCurrentItem(0);
405 mSummaryEdit->setEditText(event->summary()); 391 mSummaryEdit->setEditText(event->summary());
406 mLocationEdit->setEditText(event->location()); 392 mLocationEdit->setEditText(event->location());
407 mDescriptionEdit->setText(event->description()); 393 mDescriptionEdit->setText(event->description());
408 394
409#if 0 395#if 0
410 // organizer information 396 // organizer information
411 mOwnerLabel->setText(i18n("Owner: ") + event->organizer()); 397 mOwnerLabel->setText(i18n("Owner: ") + event->organizer());
412#endif 398#endif
413 399
414 enableAlarmEdit( event->isAlarmEnabled() ); 400 enableAlarmEdit( event->isAlarmEnabled() );
415 //qDebug("KOEditorGeneral::readIncidence(Incidence *event) "); 401 //qDebug("KOEditorGeneral::readIncidence(Incidence *event) ");
416 if(!event->isAlarmEnabled()) { 402 if(!event->isAlarmEnabled()) {
417 // TODO: Implement a KPrefsComboItem to solve this in a clean way. 403 // TODO: Implement a KPrefsComboItem to solve this in a clean way.
418 int alarmTime; 404 int alarmTime;
419 int a[] = { 1,5,10,15,30,60,180, 1440 }; 405 int a[] = { 1,5,10,15,30,60,180, 1440 };
420 int index = KOPrefs::instance()->mAlarmTime; 406 int index = KOPrefs::instance()->mAlarmTime;
421 if (index < 0 || index > 7) { 407 if (index < 0 || index > 7) {
422 alarmTime = 15; 408 alarmTime = 15;
423 } else { 409 } else {
424 alarmTime = a[index]; 410 alarmTime = a[index];
425 } 411 }
426 mAlarmTimeEdit->setValue(alarmTime); 412 mAlarmTimeEdit->setValue(alarmTime);
427 } 413 }
428 mAlarmButton->setChecked( event->isAlarmEnabled() ); 414 mAlarmButton->setChecked( event->isAlarmEnabled() );
429 mSecrecyCombo->setCurrentItem(event->secrecy()); 415 mSecrecyCombo->setCurrentItem(event->secrecy());
430 mCancelBox->setChecked( event->cancelled() ); 416 mCancelBox->setChecked( event->cancelled() );
431 mAlarmProgramButton->setOn(false); 417 mAlarmProgramButton->setOn(false);
432 mAlarmSoundButton->setOn(false); 418 mAlarmSoundButton->setOn(false);
433 419
434 // set up alarm stuff 420 // set up alarm stuff
435 QPtrList<Alarm> alarms = event->alarms(); 421 QPtrList<Alarm> alarms = event->alarms();
436 Alarm* alarm; 422 Alarm* alarm;
437 mAlarmIncrCombo->setCurrentItem(0); 423 mAlarmIncrCombo->setCurrentItem(0);
438 for ( alarm = alarms.first(); alarm; alarm = alarms.next() ) { 424 for ( alarm = alarms.first(); alarm; alarm = alarms.next() ) {
439 int offset; 425 int offset;
440 if ( alarm->hasTime() ) { 426 if ( alarm->hasTime() ) {
441 QDateTime t = alarm->time(); 427 QDateTime t = alarm->time();
442 offset = event->dtStart().secsTo( t ); 428 offset = event->dtStart().secsTo( t );
443 } else { 429 } else {
444 offset = alarm->startOffset().asSeconds(); 430 offset = alarm->startOffset().asSeconds();
445 } 431 }
446 if ( offset != 0 ) { 432 if ( offset != 0 ) {
447 offset = offset / -60; // make minutes 433 offset = offset / -60; // make minutes
448 if (offset % 60 == 0) { // divides evenly into hours? 434 if (offset % 60 == 0) { // divides evenly into hours?
449 offset = offset / 60; 435 offset = offset / 60;
450 mAlarmIncrCombo->setCurrentItem(1); 436 mAlarmIncrCombo->setCurrentItem(1);
451 if (offset % 24 == 0) { // divides evenly into days? 437 if (offset % 24 == 0) { // divides evenly into days?
452 offset = offset / 24; 438 offset = offset / 24;
453 mAlarmIncrCombo->setCurrentItem(2); 439 mAlarmIncrCombo->setCurrentItem(2);
454 } 440 }
455 } 441 }
456 } 442 }
457 mAlarmTimeEdit->setValue( offset ); 443 mAlarmTimeEdit->setValue( offset );
458 if (alarm->type() == Alarm::Procedure) { 444 if (alarm->type() == Alarm::Procedure) {
459 445
460 mAlarmProgram = alarm->programFile(); 446 mAlarmProgram = alarm->programFile();
461 mAlarmProgramButton->setOn(true); 447 mAlarmProgramButton->setOn(true);
462 QString dispStr = i18n("Running '%1'").arg(mAlarmProgram); 448 QString dispStr = i18n("Running '%1'").arg(mAlarmProgram);
463 QToolTip::add(mAlarmProgramButton, dispStr); 449 QToolTip::add(mAlarmProgramButton, dispStr);
464 } 450 }
465 else if (alarm->type() == Alarm::Audio) { 451 else if (alarm->type() == Alarm::Audio) {
466 mAlarmSound = alarm->audioFile(); 452 mAlarmSound = alarm->audioFile();
467 if ( ! QFile::exists( mAlarmSound ) ) 453 if ( ! QFile::exists( mAlarmSound ) )
468 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile; 454 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
469 mAlarmSoundButton->setOn(true); 455 mAlarmSoundButton->setOn(true);
470 QString dispStr = i18n("Playing '%1'").arg(mAlarmSound); 456 QString dispStr = i18n("Playing '%1'").arg(mAlarmSound);
471 QToolTip::add(mAlarmSoundButton, dispStr); 457 QToolTip::add(mAlarmSoundButton, dispStr);
472 } 458 }
473 mAlarmButton->setChecked(alarm->enabled()); 459 mAlarmButton->setChecked(alarm->enabled());
474 enableAlarmEdit( alarm->enabled() ); 460 enableAlarmEdit( alarm->enabled() );
475 //qDebug("nableAlarmEdit( alarm->enabled() )********* "); 461 //qDebug("nableAlarmEdit( alarm->enabled() )********* ");
476 // TODO: Deal with multiple alarms 462 // TODO: Deal with multiple alarms
477 break; // For now, stop after the first alarm 463 break; // For now, stop after the first alarm
478 } 464 }
479 465
480 setCategories(event->categoriesStr()); 466 setCategories(event->categoriesStr());
481} 467}
482 468
483void KOEditorGeneral::writeIncidence(Incidence *event) 469void KOEditorGeneral::writeIncidence(Incidence *event)
484{ 470{
485 // kdDebug() << "KOEditorGeneral::writeEvent()" << endl; 471 // kdDebug() << "KOEditorGeneral::writeEvent()" << endl;
486 mLocationEdit->save(KOLocationBox::LOCATION); 472 mLocationEdit->save(KOLocationBox::LOCATION);
487 event->setSummary(mSummaryEdit->currentText()); 473 event->setSummary(mSummaryEdit->currentText());
488 event->setLocation(mLocationEdit->currentText()); 474 event->setLocation(mLocationEdit->currentText());
489 event->setDescription(mDescriptionEdit->text()); 475 event->setDescription(mDescriptionEdit->text());
490 event->setCategories(mCategoriesLabel->text()); 476 event->setCategories(mCategoriesLabel->text());
491 event->setSecrecy(mSecrecyCombo->currentItem()); 477 event->setSecrecy(mSecrecyCombo->currentItem());
492 event->setCancelled(mCancelBox->isChecked() );; 478 event->setCancelled(mCancelBox->isChecked() );;
493 // alarm stuff 479 // alarm stuff
494 if (mAlarmButton->isChecked()) { 480 if (mAlarmButton->isChecked()) {
495 if (event->alarms().count() == 0) 481 if (event->alarms().count() == 0)
496 event->newAlarm(); 482 event->newAlarm();
497 QPtrList<Alarm> alarms = event->alarms(); 483 QPtrList<Alarm> alarms = event->alarms();
498 Alarm *alarm; 484 Alarm *alarm;
499 for (alarm = alarms.first(); alarm; alarm = alarms.next() ) { 485 for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
500 alarm->setEnabled(true); 486 alarm->setEnabled(true);
501 int j = mAlarmTimeEdit->value()* -60; 487 int j = mAlarmTimeEdit->value()* -60;
502 if (mAlarmIncrCombo->currentItem() == 1) 488 if (mAlarmIncrCombo->currentItem() == 1)
503 j = j * 60; 489 j = j * 60;
504 else if (mAlarmIncrCombo->currentItem() == 2) 490 else if (mAlarmIncrCombo->currentItem() == 2)
505 j = j * (60 * 24); 491 j = j * (60 * 24);
506 alarm->setStartOffset( j ); 492 alarm->setStartOffset( j );
507 493
508 if (!mAlarmProgram.isEmpty() && mAlarmProgramButton->isOn()) { 494 if (!mAlarmProgram.isEmpty() && mAlarmProgramButton->isOn()) {
509 alarm->setProcedureAlarm(mAlarmProgram); 495 alarm->setProcedureAlarm(mAlarmProgram);
510 } 496 }
511 else if (!mAlarmSound.isEmpty() && mAlarmSoundButton->isOn()) 497 else if (!mAlarmSound.isEmpty() && mAlarmSoundButton->isOn())
512 alarm->setAudioAlarm(mAlarmSound); 498 alarm->setAudioAlarm(mAlarmSound);
513 else 499 else
514 alarm->setType(Alarm::Invalid); 500 alarm->setType(Alarm::Invalid);
515 //alarm->setAudioAlarm("default"); 501 //alarm->setAudioAlarm("default");
516 // TODO: Deal with multiple alarms 502 // TODO: Deal with multiple alarms
517 break; // For now, stop after the first alarm 503 break; // For now, stop after the first alarm
518 } 504 }
519 } else { 505 } else {
520 Alarm* alarm = event->alarms().first(); 506 Alarm* alarm = event->alarms().first();
521 if ( alarm ) { 507 if ( alarm ) {
522 alarm->setEnabled(false); 508 alarm->setEnabled(false);
523 alarm->setType(Alarm::Invalid); 509 alarm->setType(Alarm::Invalid);
524 } 510 }
525 } 511 }
526} 512}