summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaitem.cpp10
-rw-r--r--korganizer/koprefs.cpp1
-rw-r--r--korganizer/koprefs.h1
-rw-r--r--korganizer/koprefsdialog.cpp6
4 files changed, 17 insertions, 1 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index ee9f39a..a05c60e 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -1,730 +1,738 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18*/ 18*/
19 19
20#include <qlabel.h> 20#include <qlabel.h>
21#include <qlayout.h> 21#include <qlayout.h>
22#include <qhbox.h> 22#include <qhbox.h>
23#include <qvbox.h> 23#include <qvbox.h>
24#include <qtooltip.h> 24#include <qtooltip.h>
25#include <qwhatsthis.h> 25#include <qwhatsthis.h>
26#include <qdragobject.h> 26#include <qdragobject.h>
27#include <qdrawutil.h> 27#include <qdrawutil.h>
28#include <qpainter.h> 28#include <qpainter.h>
29 29
30#include <kiconloader.h> 30#include <kiconloader.h>
31#include <kdebug.h> 31#include <kdebug.h>
32#include <kglobal.h> 32#include <kglobal.h>
33#include <klocale.h> 33#include <klocale.h>
34#ifndef DESKTOP_VERSION 34#ifndef DESKTOP_VERSION
35#include <qpe/qpeapplication.h> 35#include <qpe/qpeapplication.h>
36#define AGENDA_ICON_SIZE 5 36#define AGENDA_ICON_SIZE 5
37#else 37#else
38#define AGENDA_ICON_SIZE 7 38#define AGENDA_ICON_SIZE 7
39#endif 39#endif
40#include <libkcal/icaldrag.h> 40#include <libkcal/icaldrag.h>
41#include <libkcal/vcaldrag.h> 41#include <libkcal/vcaldrag.h>
42#include <libkcal/kincidenceformatter.h> 42#include <libkcal/kincidenceformatter.h>
43extern int globalFlagBlockAgenda; 43extern int globalFlagBlockAgenda;
44extern int globalFlagBlockAgendaItemPaint; 44extern int globalFlagBlockAgendaItemPaint;
45extern int globalFlagBlockAgendaItemUpdate; 45extern int globalFlagBlockAgendaItemUpdate;
46 46
47#include "koprefs.h" 47#include "koprefs.h"
48 48
49#include "koagendaitem.h" 49#include "koagendaitem.h"
50//#include "koagendaitem.moc" 50//#include "koagendaitem.moc"
51 51
52 52
53//-------------------------------------------------------------------------- 53//--------------------------------------------------------------------------
54 54
55QToolTipGroup *KOAgendaItem::mToolTipGroup = 0; 55QToolTipGroup *KOAgendaItem::mToolTipGroup = 0;
56 56
57//-------------------------------------------------------------------------- 57//--------------------------------------------------------------------------
58 58
59KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday, 59KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday,
60 const char *name,WFlags) : 60 const char *name,WFlags) :
61 QWidget(parent, name), mIncidence(incidence), mDate(qd) 61 QWidget(parent, name), mIncidence(incidence), mDate(qd)
62{ 62{
63#ifndef DESKTOP_VERSION 63#ifndef DESKTOP_VERSION
64 QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); 64 QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
65#endif 65#endif
66 int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase 66 int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase
67 setWFlags ( wflags); 67 setWFlags ( wflags);
68 mAllDay = allday; 68 mAllDay = allday;
69 init ( incidence, qd ); 69 init ( incidence, qd );
70 setMouseTracking(true); 70 setMouseTracking(true);
71 //setAcceptDrops(true); 71 //setAcceptDrops(true);
72 xPaintCoord = -1; 72 xPaintCoord = -1;
73 yPaintCoord = -1; 73 yPaintCoord = -1;
74} 74}
75 75
76void KOAgendaItem::init ( Incidence *incidence, QDate qd ) 76void KOAgendaItem::init ( Incidence *incidence, QDate qd )
77{ 77{
78 mIncidence = incidence; 78 mIncidence = incidence;
79 mDate = qd; 79 mDate = qd;
80 mFirstMultiItem = 0; 80 mFirstMultiItem = 0;
81 mNextMultiItem = 0; 81 mNextMultiItem = 0;
82 mLastMultiItem = 0; 82 mLastMultiItem = 0;
83 computeText(); 83 computeText();
84 84
85 if ( (incidence->type() == "Todo") && 85 if ( (incidence->type() == "Todo") &&
86 ( !((static_cast<Todo*>(incidence))->isCompleted()) && 86 ( !((static_cast<Todo*>(incidence))->isCompleted()) &&
87 ((static_cast<Todo*>(incidence))->dtDue().date() <= QDate::currentDate()) ) ) { 87 ((static_cast<Todo*>(incidence))->dtDue().date() <= QDate::currentDate()) ) ) {
88 if ( (static_cast<Todo*>(incidence))->dtDue() < QDateTime::currentDateTime().date()) 88 if ( (static_cast<Todo*>(incidence))->dtDue() < QDateTime::currentDateTime().date())
89 mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ; 89 mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ;
90 else 90 else
91 mBackgroundColor = KOPrefs::instance()->mTodoDueTodayColor; 91 mBackgroundColor = KOPrefs::instance()->mTodoDueTodayColor;
92 } 92 }
93 else { 93 else {
94 QStringList categories = mIncidence->categories(); 94 QStringList categories = mIncidence->categories();
95 QString cat = categories.first(); 95 QString cat = categories.first();
96 if (cat.isEmpty()) { 96 if (cat.isEmpty()) {
97 mBackgroundColor =KOPrefs::instance()->mEventColor; 97 if ( (incidence->type() == "Todo") &&((static_cast<Todo*>(incidence))->isCompleted()) )
98 mBackgroundColor =KOPrefs::instance()->mTodoDoneColor;
99 else
100 mBackgroundColor =KOPrefs::instance()->mEventColor;
98 } else { 101 } else {
99 mBackgroundColor = *KOPrefs::instance()->categoryColor(cat); 102 mBackgroundColor = *KOPrefs::instance()->categoryColor(cat);
103 if ( (incidence->type() == "Todo") &&((static_cast<Todo*>(incidence))->isCompleted()) ) {
104 if ( mBackgroundColor == KOPrefs::instance()->mEventColor )
105 mBackgroundColor =KOPrefs::instance()->mTodoDoneColor;
106 }
100 } 107 }
108
101 } 109 }
102 mColorGroup = QColorGroup( mBackgroundColor.light(), 110 mColorGroup = QColorGroup( mBackgroundColor.light(),
103 mBackgroundColor.dark(),mBackgroundColor.light(), 111 mBackgroundColor.dark(),mBackgroundColor.light(),
104 mBackgroundColor.dark(),mBackgroundColor, black, mBackgroundColor) ; 112 mBackgroundColor.dark(),mBackgroundColor, black, mBackgroundColor) ;
105 setBackgroundColor( mBackgroundColor ); 113 setBackgroundColor( mBackgroundColor );
106 114
107 setCellXY(0,0,1); 115 setCellXY(0,0,1);
108 setCellXWidth(0); 116 setCellXWidth(0);
109 setSubCell(0); 117 setSubCell(0);
110 setSubCells(1); 118 setSubCells(1);
111 setMultiItem(0,0,0); 119 setMultiItem(0,0,0);
112 startMove(); 120 startMove();
113 mSelected = true; 121 mSelected = true;
114 select(false); 122 select(false);
115 QFontMetrics fontinf(KOPrefs::instance()->mAgendaViewFont); 123 QFontMetrics fontinf(KOPrefs::instance()->mAgendaViewFont);
116 mFontPixelSize = fontinf.height();; 124 mFontPixelSize = fontinf.height();;
117 hide(); 125 hide();
118 xPaintCoord = -1; 126 xPaintCoord = -1;
119 yPaintCoord = -1; 127 yPaintCoord = -1;
120} 128}
121 129
122 130
123KOAgendaItem::~KOAgendaItem() 131KOAgendaItem::~KOAgendaItem()
124{ 132{
125 // qDebug("deleteKOAgendaItem::~KOAgendaItem( "); 133 // qDebug("deleteKOAgendaItem::~KOAgendaItem( ");
126 134
127} 135}
128 136
129void KOAgendaItem::recreateIncidence() 137void KOAgendaItem::recreateIncidence()
130{ 138{
131#if 0 139#if 0
132 Incidence* newInc = mIncidence->clone(); 140 Incidence* newInc = mIncidence->clone();
133 newInc->recreate(); 141 newInc->recreate();
134 if ( mIncidence->doesRecur() ) { 142 if ( mIncidence->doesRecur() ) {
135 mIncidence->addExDate( mDate ); 143 mIncidence->addExDate( mDate );
136 newInc->recurrence()->unsetRecurs(); 144 newInc->recurrence()->unsetRecurs();
137 int len = mIncidence->dtStart().secsTo( ((Event*)mIncidence)->dtEnd()); 145 int len = mIncidence->dtStart().secsTo( ((Event*)mIncidence)->dtEnd());
138 QTime tim = mIncidence->dtStart().time(); 146 QTime tim = mIncidence->dtStart().time();
139 newInc->setDtStart( QDateTime(mDate, tim) ); 147 newInc->setDtStart( QDateTime(mDate, tim) );
140 ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) ); 148 ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) );
141 } 149 }
142#endif 150#endif
143 mIncidence = mIncidence->recreateCloneException( mDate ); 151 mIncidence = mIncidence->recreateCloneException( mDate );
144} 152}
145bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout) 153bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
146{ 154{
147 int size = AGENDA_ICON_SIZE; 155 int size = AGENDA_ICON_SIZE;
148 156
149 int yOff = 0; 157 int yOff = 0;
150 int xOff = 0; 158 int xOff = 0;
151 int x = pos().x() +3; 159 int x = pos().x() +3;
152 int y; 160 int y;
153 if ( mAllDay ) 161 if ( mAllDay )
154 y = pos().y()+3; 162 y = pos().y()+3;
155 else 163 else
156 y = mCellYTop * ( height() / cellHeight() ) +3; 164 y = mCellYTop * ( height() / cellHeight() ) +3;
157 if (mIncidence->cancelled()) { 165 if (mIncidence->cancelled()) {
158 int xpos = xOff*( 1 +AGENDA_ICON_SIZE )+x; 166 int xpos = xOff*( 1 +AGENDA_ICON_SIZE )+x;
159 int ypos = yOff*( 1 +AGENDA_ICON_SIZE)+y; 167 int ypos = yOff*( 1 +AGENDA_ICON_SIZE)+y;
160 p->drawLine( xpos, ypos, xpos+AGENDA_ICON_SIZE-1, ypos+AGENDA_ICON_SIZE-1 ); 168 p->drawLine( xpos, ypos, xpos+AGENDA_ICON_SIZE-1, ypos+AGENDA_ICON_SIZE-1 );
161 p->drawLine( xpos, ypos+AGENDA_ICON_SIZE-1, xpos+AGENDA_ICON_SIZE-1, ypos ); 169 p->drawLine( xpos, ypos+AGENDA_ICON_SIZE-1, xpos+AGENDA_ICON_SIZE-1, ypos );
162 if ( horLayout ) 170 if ( horLayout )
163 ++xOff; 171 ++xOff;
164 else 172 else
165 ++yOff; 173 ++yOff;
166 } 174 }
167 if (mIncidence->isAlarmEnabled()) { 175 if (mIncidence->isAlarmEnabled()) {
168 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, red ); 176 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, red );
169 if ( horLayout ) 177 if ( horLayout )
170 ++xOff; 178 ++xOff;
171 else 179 else
172 ++yOff; 180 ++yOff;
173 } 181 }
174 if (mIncidence->recurrence()->doesRecur()) { 182 if (mIncidence->recurrence()->doesRecur()) {
175 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, blue ); 183 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, blue );
176 if ( horLayout ) 184 if ( horLayout )
177 ++xOff; 185 ++xOff;
178 else 186 else
179 ++yOff; 187 ++yOff;
180 } 188 }
181 if (mIncidence->description().length() > 0) { 189 if (mIncidence->description().length() > 0) {
182 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkGreen ); 190 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkGreen );
183 if ( horLayout ) 191 if ( horLayout )
184 ++xOff; 192 ++xOff;
185 else 193 else
186 ++yOff; 194 ++yOff;
187 } 195 }
188 if (mIncidence->isReadOnly()) { 196 if (mIncidence->isReadOnly()) {
189 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, white ); 197 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, white );
190 if ( horLayout ) 198 if ( horLayout )
191 ++xOff; 199 ++xOff;
192 else 200 else
193 ++yOff; 201 ++yOff;
194 } 202 }
195 203
196 if (mIncidence->attendeeCount()>0) { 204 if (mIncidence->attendeeCount()>0) {
197 205
198 if (mIncidence->organizer() == KOPrefs::instance()->email()) { 206 if (mIncidence->organizer() == KOPrefs::instance()->email()) {
199 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, black ); 207 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, black );
200 if ( horLayout ) 208 if ( horLayout )
201 ++xOff; 209 ++xOff;
202 else 210 else
203 ++yOff; 211 ++yOff;
204 } else { 212 } else {
205 Attendee *me = mIncidence->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email()); 213 Attendee *me = mIncidence->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email());
206 if (me!=0) { 214 if (me!=0) {
207 215
208 216
209 } else { 217 } else {
210 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, yellow ); 218 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, yellow );
211 if ( horLayout ) 219 if ( horLayout )
212 ++xOff; 220 ++xOff;
213 else 221 else
214 ++yOff; 222 ++yOff;
215 223
216 } 224 }
217 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkYellow ); 225 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkYellow );
218 if ( horLayout ) 226 if ( horLayout )
219 ++xOff; 227 ++xOff;
220 else 228 else
221 ++yOff; 229 ++yOff;
222 230
223 } 231 }
224 232
225 } 233 }
226 return ( yOff || xOff ); 234 return ( yOff || xOff );
227} 235}
228 236
229 237
230void KOAgendaItem::select(bool selected) 238void KOAgendaItem::select(bool selected)
231{ 239{
232 //qDebug("select %d %d",firstMultiItem(), nextMultiItem() ); 240 //qDebug("select %d %d",firstMultiItem(), nextMultiItem() );
233 if (mSelected == selected) return; 241 if (mSelected == selected) return;
234 mSelected = selected; 242 mSelected = selected;
235 if ( ! isVisible() ) 243 if ( ! isVisible() )
236 return; 244 return;
237 if ( firstMultiItem() ) 245 if ( firstMultiItem() )
238 firstMultiItem()->select( selected ); 246 firstMultiItem()->select( selected );
239 if ( !firstMultiItem() && nextMultiItem() ) { 247 if ( !firstMultiItem() && nextMultiItem() ) {
240 KOAgendaItem * placeItem = nextMultiItem(); 248 KOAgendaItem * placeItem = nextMultiItem();
241 while ( placeItem ) { 249 while ( placeItem ) {
242 placeItem->select( selected ); 250 placeItem->select( selected );
243 placeItem = placeItem->nextMultiItem(); 251 placeItem = placeItem->nextMultiItem();
244 } 252 }
245 } 253 }
246 globalFlagBlockAgendaItemUpdate = 0; 254 globalFlagBlockAgendaItemUpdate = 0;
247 paintMe( selected ); 255 paintMe( selected );
248 globalFlagBlockAgendaItemUpdate = 1; 256 globalFlagBlockAgendaItemUpdate = 1;
249 repaint( false ); 257 repaint( false );
250} 258}
251 259
252 260
253/* 261/*
254 The eventFilter has to filter the mouse events of the agenda item childs. The 262 The eventFilter has to filter the mouse events of the agenda item childs. The
255 events are fed into the event handling method of KOAgendaItem. This allows the 263 events are fed into the event handling method of KOAgendaItem. This allows the
256 KOAgenda to handle the KOAgendaItems by using an eventFilter. 264 KOAgenda to handle the KOAgendaItems by using an eventFilter.
257*/ 265*/
258bool KOAgendaItem::eventFilter ( QObject *object, QEvent *e ) 266bool KOAgendaItem::eventFilter ( QObject *object, QEvent *e )
259{ 267{
260 if (e->type() == QEvent::MouseButtonPress || 268 if (e->type() == QEvent::MouseButtonPress ||
261 e->type() == QEvent::MouseButtonDblClick || 269 e->type() == QEvent::MouseButtonDblClick ||
262 e->type() == QEvent::MouseButtonRelease || 270 e->type() == QEvent::MouseButtonRelease ||
263 e->type() == QEvent::MouseMove) { 271 e->type() == QEvent::MouseMove) {
264 QMouseEvent *me = (QMouseEvent *)e; 272 QMouseEvent *me = (QMouseEvent *)e;
265 QPoint itemPos = this->mapFromGlobal(((QWidget *)object)-> 273 QPoint itemPos = this->mapFromGlobal(((QWidget *)object)->
266 mapToGlobal(me->pos())); 274 mapToGlobal(me->pos()));
267 QMouseEvent returnEvent (e->type(),itemPos,me->button(),me->state()); 275 QMouseEvent returnEvent (e->type(),itemPos,me->button(),me->state());
268 return event(&returnEvent); 276 return event(&returnEvent);
269 } else { 277 } else {
270 return false; 278 return false;
271 } 279 }
272} 280}
273void KOAgendaItem::repaintMe( ) 281void KOAgendaItem::repaintMe( )
274{ 282{
275 paintMe ( mSelected ); 283 paintMe ( mSelected );
276} 284}
277void KOAgendaItem::paintMe( bool selected, QPainter* paint ) 285void KOAgendaItem::paintMe( bool selected, QPainter* paint )
278{ 286{
279 if ( globalFlagBlockAgendaItemUpdate && ! selected) 287 if ( globalFlagBlockAgendaItemUpdate && ! selected)
280 return; 288 return;
281 QPainter pa; 289 QPainter pa;
282 290
283 if ( mSelected ) { 291 if ( mSelected ) {
284 pa.begin( paintPixSel() ); 292 pa.begin( paintPixSel() );
285 } else { 293 } else {
286 if ( mAllDay ) 294 if ( mAllDay )
287 pa.begin( paintPixAllday() ); 295 pa.begin( paintPixAllday() );
288 else 296 else
289 pa.begin( paintPix() ); 297 pa.begin( paintPix() );
290 } 298 }
291 int x, yy, w, h; 299 int x, yy, w, h;
292 float nfh; 300 float nfh;
293 x = pos().x(); w = width(); h = height (); 301 x = pos().x(); w = width(); h = height ();
294 if ( mAllDay ) 302 if ( mAllDay )
295 yy = y(); 303 yy = y();
296 else 304 else
297 yy = mCellYTop * ( height() / cellHeight() ); 305 yy = mCellYTop * ( height() / cellHeight() );
298 xPaintCoord= x; 306 xPaintCoord= x;
299 yPaintCoord = yy; 307 yPaintCoord = yy;
300 wPaintCoord = width(); 308 wPaintCoord = width();
301 hPaintCoord = height(); 309 hPaintCoord = height();
302 //qDebug("paintMe %s %d %d %d %d",incidence()->summary().latin1(), x, yy, width(), height()); 310 //qDebug("paintMe %s %d %d %d %d",incidence()->summary().latin1(), x, yy, width(), height());
303 if ( paint == 0 ) 311 if ( paint == 0 )
304 paint = &pa; 312 paint = &pa;
305 bool horLayout = ( w < h ); 313 bool horLayout = ( w < h );
306 int maxhei = mFontPixelSize+4; 314 int maxhei = mFontPixelSize+4;
307 if ( horLayout ) 315 if ( horLayout )
308 maxhei += AGENDA_ICON_SIZE -4; 316 maxhei += AGENDA_ICON_SIZE -4;
309 bool small = ( h < maxhei ); 317 bool small = ( h < maxhei );
310 if ( ! small ) 318 if ( ! small )
311 paint->setFont(KOPrefs::instance()->mAgendaViewFont); 319 paint->setFont(KOPrefs::instance()->mAgendaViewFont);
312 else { 320 else {
313 QFont f = KOPrefs::instance()->mAgendaViewFont; 321 QFont f = KOPrefs::instance()->mAgendaViewFont;
314 f.setBold( false ); 322 f.setBold( false );
315 int fh = f.pointSize(); 323 int fh = f.pointSize();
316 nfh = (((float)height())/(float)(mFontPixelSize+4))*fh; 324 nfh = (((float)height())/(float)(mFontPixelSize+4))*fh;
317 if ( nfh < 6 ) 325 if ( nfh < 6 )
318 nfh = 6; 326 nfh = 6;
319 f.setPointSize( nfh ); 327 f.setPointSize( nfh );
320 paint->setFont(f); 328 paint->setFont(f);
321 } 329 }
322 paint->fillRect ( x, yy, w, h, mBackgroundColor ); 330 paint->fillRect ( x, yy, w, h, mBackgroundColor );
323 static const QPixmap completedPxmp = SmallIcon("greenhook16"); 331 static const QPixmap completedPxmp = SmallIcon("greenhook16");
324 static const QPixmap overduePxmp = SmallIcon("redcross16"); 332 static const QPixmap overduePxmp = SmallIcon("redcross16");
325 if ( mIncidence->type() == "Todo" ) { 333 if ( mIncidence->type() == "Todo" ) {
326 Todo* tempTodo = static_cast<Todo*>(mIncidence); 334 Todo* tempTodo = static_cast<Todo*>(mIncidence);
327 int xx = pos().x()+(width()-completedPxmp.width()-3 ); 335 int xx = pos().x()+(width()-completedPxmp.width()-3 );
328 int yyy = yy+3; 336 int yyy = yy+3;
329 if ( tempTodo->isCompleted() ) 337 if ( tempTodo->isCompleted() )
330 paint->drawPixmap ( xx, yyy, completedPxmp ); 338 paint->drawPixmap ( xx, yyy, completedPxmp );
331 else { 339 else {
332 paint->drawPixmap ( xx, yyy, overduePxmp ); 340 paint->drawPixmap ( xx, yyy, overduePxmp );
333 341
334 } 342 }
335 } 343 }
336 bool addIcon = false; 344 bool addIcon = false;
337 if ( ! small || w > 3 * h || h > 3* w ) 345 if ( ! small || w > 3 * h || h > 3* w )
338 addIcon = updateIcons( paint, horLayout ); 346 addIcon = updateIcons( paint, horLayout );
339 347
340 qDrawShadePanel (paint, x, yy, w, h, mColorGroup, selected , 2, 0); 348 qDrawShadePanel (paint, x, yy, w, h, mColorGroup, selected , 2, 0);
341 //qDebug("draw rect %d %d %d %d ",x, yy, w, h ); 349 //qDebug("draw rect %d %d %d %d ",x, yy, w, h );
342 if ( ! small ) { 350 if ( ! small ) {
343 x += 3; yy += 3;w -= 6; h-= 5; 351 x += 3; yy += 3;w -= 6; h-= 5;
344 } else { 352 } else {
345 x += 2; yy += 1;w -= 4; h-= 4; 353 x += 2; yy += 1;w -= 4; h-= 4;
346 if ( nfh < 6.01 ) { 354 if ( nfh < 6.01 ) {
347 yy -= 2; 355 yy -= 2;
348 h += 4; 356 h += 4;
349 } 357 }
350 else 358 else
351 if ( nfh < h -2 ) 359 if ( nfh < h -2 )
352 ++yy; 360 ++yy;
353 } 361 }
354 int align; 362 int align;
355#ifndef DESKTOP_VERSION 363#ifndef DESKTOP_VERSION
356 align = ( AlignLeft|WordBreak|AlignTop); 364 align = ( AlignLeft|WordBreak|AlignTop);
357#else 365#else
358 align = ( AlignLeft|BreakAnywhere|WordBreak|AlignTop); 366 align = ( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
359#endif 367#endif
360 if ( addIcon ) { 368 if ( addIcon ) {
361 if ( ! horLayout ) { 369 if ( ! horLayout ) {
362 x += AGENDA_ICON_SIZE+3; 370 x += AGENDA_ICON_SIZE+3;
363 w -= (AGENDA_ICON_SIZE+3); 371 w -= (AGENDA_ICON_SIZE+3);
364 } 372 }
365 else { 373 else {
366 yy+= AGENDA_ICON_SIZE+2; 374 yy+= AGENDA_ICON_SIZE+2;
367 h -=(AGENDA_ICON_SIZE+3); 375 h -=(AGENDA_ICON_SIZE+3);
368 } 376 }
369 } 377 }
370 int colsum = mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue(); 378 int colsum = mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue();
371 if ( colsum < 250 ) 379 if ( colsum < 250 )
372 paint->setPen ( white); 380 paint->setPen ( white);
373 if ( x < 0 ) { 381 if ( x < 0 ) {
374 w = w+x-3; 382 w = w+x-3;
375 x = 3; 383 x = 3;
376 if ( w > parentWidget()->width() ){ 384 if ( w > parentWidget()->width() ){
377 w = parentWidget()->width() - 6; 385 w = parentWidget()->width() - 6;
378#ifndef DESKTOP_VERSION 386#ifndef DESKTOP_VERSION
379 align = ( AlignCenter|WordBreak); 387 align = ( AlignCenter|WordBreak);
380#else 388#else
381 align = ( AlignCenter|BreakAnywhere|WordBreak); 389 align = ( AlignCenter|BreakAnywhere|WordBreak);
382#endif 390#endif
383 391
384 } 392 }
385 } 393 }
386 QRect dr; 394 QRect dr;
387 paint->drawText ( x, yy, w, h, align, mDisplayedText, -1, &dr ); 395 paint->drawText ( x, yy, w, h, align, mDisplayedText, -1, &dr );
388 if ( mIncidence->cancelled() ){ 396 if ( mIncidence->cancelled() ){
389 if ( ! small ) { 397 if ( ! small ) {
390 QFontMetrics fm ( paint->font() ); 398 QFontMetrics fm ( paint->font() );
391 paint->drawLine(dr.left(), yy+fm.height()/2, dr.right()-2, yy+fm.height()/2); 399 paint->drawLine(dr.left(), yy+fm.height()/2, dr.right()-2, yy+fm.height()/2);
392 } 400 }
393 401
394 } 402 }
395 pa.end(); 403 pa.end();
396 404
397} 405}
398void KOAgendaItem::resizePixmap( int w , int h ) 406void KOAgendaItem::resizePixmap( int w , int h )
399{ 407{
400 paintPix()->resize( w, h ); 408 paintPix()->resize( w, h );
401 paintPixSel()->resize( w, h ); 409 paintPixSel()->resize( w, h );
402 410
403} 411}
404QPixmap * KOAgendaItem::paintPix() 412QPixmap * KOAgendaItem::paintPix()
405{ 413{
406 static QPixmap* mPaintPix = 0; 414 static QPixmap* mPaintPix = 0;
407 if ( ! mPaintPix ) 415 if ( ! mPaintPix )
408 mPaintPix = new QPixmap(1,1); 416 mPaintPix = new QPixmap(1,1);
409 return mPaintPix ; 417 return mPaintPix ;
410} 418}
411QPixmap * KOAgendaItem::paintPixAllday() 419QPixmap * KOAgendaItem::paintPixAllday()
412{ 420{
413 static QPixmap* mPaintPixA = 0; 421 static QPixmap* mPaintPixA = 0;
414 if ( ! mPaintPixA ) 422 if ( ! mPaintPixA )
415 mPaintPixA = new QPixmap(1,1); 423 mPaintPixA = new QPixmap(1,1);
416 return mPaintPixA ; 424 return mPaintPixA ;
417} 425}
418QPixmap * KOAgendaItem::paintPixSel() 426QPixmap * KOAgendaItem::paintPixSel()
419{ 427{
420 static QPixmap* mPaintPixSel = 0; 428 static QPixmap* mPaintPixSel = 0;
421 if ( ! mPaintPixSel ) 429 if ( ! mPaintPixSel )
422 mPaintPixSel = new QPixmap(1,1); 430 mPaintPixSel = new QPixmap(1,1);
423 return mPaintPixSel ; 431 return mPaintPixSel ;
424} 432}
425void KOAgendaItem::paintEvent ( QPaintEvent *e ) 433void KOAgendaItem::paintEvent ( QPaintEvent *e )
426{ 434{
427 435
428 if ( globalFlagBlockAgendaItemPaint ) 436 if ( globalFlagBlockAgendaItemPaint )
429 return; 437 return;
430 if ( globalFlagBlockAgenda > 0 && globalFlagBlockAgenda < 5 ) 438 if ( globalFlagBlockAgenda > 0 && globalFlagBlockAgenda < 5 )
431 return; 439 return;
432 int yy; 440 int yy;
433 if ( mAllDay ) 441 if ( mAllDay )
434 yy = y(); 442 yy = y();
435 else 443 else
436 yy = mCellYTop * ( height() / cellHeight() ); 444 yy = mCellYTop * ( height() / cellHeight() );
437 int xx = x(); 445 int xx = x();
438 if ( xPaintCoord != xx || yPaintCoord != yy || 446 if ( xPaintCoord != xx || yPaintCoord != yy ||
439 wPaintCoord != width() || hPaintCoord != height()) { 447 wPaintCoord != width() || hPaintCoord != height()) {
440 xPaintCoord= xx; 448 xPaintCoord= xx;
441 yPaintCoord = yy; 449 yPaintCoord = yy;
442 wPaintCoord = width(); 450 wPaintCoord = width();
443 hPaintCoord = height(); 451 hPaintCoord = height();
444 globalFlagBlockAgendaItemUpdate = 0; 452 globalFlagBlockAgendaItemUpdate = 0;
445 paintMe( mSelected ); 453 paintMe( mSelected );
446 //qDebug("calling paintMe "); 454 //qDebug("calling paintMe ");
447 globalFlagBlockAgendaItemUpdate = 1; 455 globalFlagBlockAgendaItemUpdate = 1;
448 } 456 }
449 int rx, ry, rw, rh; 457 int rx, ry, rw, rh;
450 rx = e->rect().x(); 458 rx = e->rect().x();
451 ry = e->rect().y(); 459 ry = e->rect().y();
452 rw = e->rect().width(); 460 rw = e->rect().width();
453 rh = e->rect().height(); 461 rh = e->rect().height();
454 //qDebug(" paintevent %s %d %d %d %d", mIncidence->summary().latin1(), x(), yy, width(), height()); 462 //qDebug(" paintevent %s %d %d %d %d", mIncidence->summary().latin1(), x(), yy, width(), height());
455 463
456 QPixmap* paintFrom ; 464 QPixmap* paintFrom ;
457 if ( mSelected ) { 465 if ( mSelected ) {
458 paintFrom = paintPixSel(); 466 paintFrom = paintPixSel();
459 } else { 467 } else {
460 if ( mAllDay ) 468 if ( mAllDay )
461 paintFrom = paintPixAllday(); 469 paintFrom = paintPixAllday();
462 else 470 else
463 paintFrom = paintPix(); 471 paintFrom = paintPix();
464 } 472 }
465 bitBlt (this, rx, ry, paintFrom, x()+rx ,yPaintCoord+ry, rw, rh ,CopyROP); 473 bitBlt (this, rx, ry, paintFrom, x()+rx ,yPaintCoord+ry, rw, rh ,CopyROP);
466} 474}
467void KOAgendaItem::computeText() 475void KOAgendaItem::computeText()
468{ 476{
469 477
470 mDisplayedText = mIncidence->summary(); 478 mDisplayedText = mIncidence->summary();
471 if ( (mIncidence->type() == "Todo") ) { 479 if ( (mIncidence->type() == "Todo") ) {
472 if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) { 480 if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) {
473 if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() ) 481 if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() )
474 mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")"; 482 mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")";
475 else if ( !(mIncidence->doesFloat())) 483 else if ( !(mIncidence->doesFloat()))
476 mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")"; 484 mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")";
477 } 485 }
478 } else { 486 } else {
479 if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda) 487 if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda)
480 mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ; 488 mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ;
481 489
482 if ( mAllDay ) { 490 if ( mAllDay ) {
483 if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) { 491 if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) {
484 mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) ; 492 mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) ;
485 } 493 }
486 } 494 }
487 495
488 } 496 }
489 497
490 if ( !mIncidence->location().isEmpty() ) { 498 if ( !mIncidence->location().isEmpty() ) {
491 if ( mAllDay ) 499 if ( mAllDay )
492 mDisplayedText += " ("; 500 mDisplayedText += " (";
493 else 501 else
494 mDisplayedText += "\n("; 502 mDisplayedText += "\n(";
495 mDisplayedText += mIncidence->location() +")"; 503 mDisplayedText += mIncidence->location() +")";
496 } 504 }
497 505
498 QString tipText = mIncidence->summary(); 506 QString tipText = mIncidence->summary();
499 QWhatsThis::add(this,KIncidenceFormatter::instance()->getFormattedText( mIncidence )); 507 QWhatsThis::add(this,KIncidenceFormatter::instance()->getFormattedText( mIncidence ));
500 if ( !mIncidence->doesFloat() ) { 508 if ( !mIncidence->doesFloat() ) {
501 if ( mIncidence->type() == "Event" ) { 509 if ( mIncidence->type() == "Event" ) {
502 if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) { 510 if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) {
503 tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr(); 511 tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr();
504 tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr(); 512 tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr();
505 } 513 }
506 else { 514 else {
507 tipText += "\n"+i18n("Time: ")+mIncidence->dtStartTimeStr(); 515 tipText += "\n"+i18n("Time: ")+mIncidence->dtStartTimeStr();
508 tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr(); 516 tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr();
509 } 517 }
510 } 518 }
511 else if ( mIncidence->type() == "Todo" ) { 519 else if ( mIncidence->type() == "Todo" ) {
512 if (mIncidence->hasStartDate()) 520 if (mIncidence->hasStartDate())
513 tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartStr(); 521 tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartStr();
514 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueStr(); 522 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueStr();
515 } 523 }
516 } else if ( mIncidence->type() == "Todo" ) { 524 } else if ( mIncidence->type() == "Todo" ) {
517 if (mIncidence->hasStartDate()) 525 if (mIncidence->hasStartDate())
518 tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartDateStr(); 526 tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartDateStr();
519 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueDateStr(); 527 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueDateStr();
520 } 528 }
521 529
522 if (!mIncidence->location().isEmpty()) { 530 if (!mIncidence->location().isEmpty()) {
523 tipText += "\n"+i18n("Location: ")+mIncidence->location(); 531 tipText += "\n"+i18n("Location: ")+mIncidence->location();
524 } 532 }
525 QToolTip::add(this,tipText,toolTipGroup(),""); 533 QToolTip::add(this,tipText,toolTipGroup(),"");
526 534
527} 535}
528void KOAgendaItem::updateItem() 536void KOAgendaItem::updateItem()
529{ 537{
530 computeText(); 538 computeText();
531 539
532 //qDebug("KOAgendaItem:: updateItem() %s %d %d ",incidence()->summary().latin1(), x(), y()); 540 //qDebug("KOAgendaItem:: updateItem() %s %d %d ",incidence()->summary().latin1(), x(), y());
533 paintMe( mSelected ); 541 paintMe( mSelected );
534 repaint( false); 542 repaint( false);
535} 543}
536 544
537void KOAgendaItem::resizeEvent ( QResizeEvent *ev ) 545void KOAgendaItem::resizeEvent ( QResizeEvent *ev )
538{ 546{
539 //qDebug("KOAgendaItem::resizeEvent %s ", mIncidence->summary().latin1()); 547 //qDebug("KOAgendaItem::resizeEvent %s ", mIncidence->summary().latin1());
540 paintMe( mSelected ); 548 paintMe( mSelected );
541 repaint( false ); 549 repaint( false );
542} 550}
543 551
544/* 552/*
545 Return height of item in units of agenda cells 553 Return height of item in units of agenda cells
546*/ 554*/
547int KOAgendaItem::cellHeight() 555int KOAgendaItem::cellHeight()
548{ 556{
549 int ret = mCellYBottom - mCellYTop + 1; 557 int ret = mCellYBottom - mCellYTop + 1;
550 if ( ret <= 0 ) { 558 if ( ret <= 0 ) {
551 ret = 1; 559 ret = 1;
552 mCellYBottom = 0; 560 mCellYBottom = 0;
553 mCellYTop = 0; 561 mCellYTop = 0;
554 } 562 }
555 return ret; 563 return ret;
556} 564}
557 565
558/* 566/*
559 Return height of item in units of agenda cells 567 Return height of item in units of agenda cells
560*/ 568*/
561int KOAgendaItem::cellWidth() 569int KOAgendaItem::cellWidth()
562{ 570{
563 return mCellXWidth - mCellX + 1; 571 return mCellXWidth - mCellX + 1;
564} 572}
565 573
566void KOAgendaItem::setItemDate(QDate qd) 574void KOAgendaItem::setItemDate(QDate qd)
567{ 575{
568 mDate = qd; 576 mDate = qd;
569} 577}
570 578
571void KOAgendaItem::setCellXY(int X, int YTop, int YBottom) 579void KOAgendaItem::setCellXY(int X, int YTop, int YBottom)
572{ 580{
573 mCellX = X; 581 mCellX = X;
574 mCellYTop = YTop; 582 mCellYTop = YTop;
575 mCellYBottom = YBottom; 583 mCellYBottom = YBottom;
576} 584}
577 585
578void KOAgendaItem::setCellXWidth(int xwidth) 586void KOAgendaItem::setCellXWidth(int xwidth)
579{ 587{
580 mCellXWidth = xwidth; 588 mCellXWidth = xwidth;
581} 589}
582 590
583void KOAgendaItem::setCellX(int XLeft, int XRight) 591void KOAgendaItem::setCellX(int XLeft, int XRight)
584{ 592{
585 mCellX = XLeft; 593 mCellX = XLeft;
586 mCellXWidth = XRight; 594 mCellXWidth = XRight;
587} 595}
588 596
589void KOAgendaItem::setCellY(int YTop, int YBottom) 597void KOAgendaItem::setCellY(int YTop, int YBottom)
590{ 598{
591 mCellYTop = YTop; 599 mCellYTop = YTop;
592 mCellYBottom = YBottom; 600 mCellYBottom = YBottom;
593} 601}
594 602
595void KOAgendaItem::setSubCell(int subCell) 603void KOAgendaItem::setSubCell(int subCell)
596{ 604{
597 mSubCell = subCell; 605 mSubCell = subCell;
598} 606}
599 607
600void KOAgendaItem::setSubCells(int subCells) 608void KOAgendaItem::setSubCells(int subCells)
601{ 609{
602 mSubCells = subCells; 610 mSubCells = subCells;
603} 611}
604 612
605void KOAgendaItem::setMultiItem(KOAgendaItem *first,KOAgendaItem *next, 613void KOAgendaItem::setMultiItem(KOAgendaItem *first,KOAgendaItem *next,
606 KOAgendaItem *last) 614 KOAgendaItem *last)
607{ 615{
608 mFirstMultiItem = first; 616 mFirstMultiItem = first;
609 mNextMultiItem = next; 617 mNextMultiItem = next;
610 mLastMultiItem = last; 618 mLastMultiItem = last;
611} 619}
612 620
613void KOAgendaItem::startMove() 621void KOAgendaItem::startMove()
614{ 622{
615 mStartCellX = mCellX; 623 mStartCellX = mCellX;
616 mStartCellXWidth = mCellXWidth; 624 mStartCellXWidth = mCellXWidth;
617 mStartCellYTop = mCellYTop; 625 mStartCellYTop = mCellYTop;
618 mStartCellYBottom = mCellYBottom; 626 mStartCellYBottom = mCellYBottom;
619} 627}
620 628
621void KOAgendaItem::resetMove() 629void KOAgendaItem::resetMove()
622{ 630{
623 mCellX = mStartCellX; 631 mCellX = mStartCellX;
624 mCellXWidth = mStartCellXWidth; 632 mCellXWidth = mStartCellXWidth;
625 mCellYTop = mStartCellYTop; 633 mCellYTop = mStartCellYTop;
626 mCellYBottom = mStartCellYBottom; 634 mCellYBottom = mStartCellYBottom;
627} 635}
628 636
629void KOAgendaItem::moveRelative(int dx, int dy) 637void KOAgendaItem::moveRelative(int dx, int dy)
630{ 638{
631 int newX = cellX() + dx; 639 int newX = cellX() + dx;
632 int newXWidth = cellXWidth() + dx; 640 int newXWidth = cellXWidth() + dx;
633 int newYTop = cellYTop() + dy; 641 int newYTop = cellYTop() + dy;
634 int newYBottom = cellYBottom() + dy; 642 int newYBottom = cellYBottom() + dy;
635 setCellXY(newX,newYTop,newYBottom); 643 setCellXY(newX,newYTop,newYBottom);
636 setCellXWidth(newXWidth); 644 setCellXWidth(newXWidth);
637} 645}
638 646
639void KOAgendaItem::expandTop(int dy) 647void KOAgendaItem::expandTop(int dy)
640{ 648{
641 int newYTop = cellYTop() + dy; 649 int newYTop = cellYTop() + dy;
642 int newYBottom = cellYBottom(); 650 int newYBottom = cellYBottom();
643 if (newYTop > newYBottom) newYTop = newYBottom; 651 if (newYTop > newYBottom) newYTop = newYBottom;
644 setCellY(newYTop, newYBottom); 652 setCellY(newYTop, newYBottom);
645} 653}
646 654
647void KOAgendaItem::expandBottom(int dy) 655void KOAgendaItem::expandBottom(int dy)
648{ 656{
649 int newYTop = cellYTop(); 657 int newYTop = cellYTop();
650 int newYBottom = cellYBottom() + dy; 658 int newYBottom = cellYBottom() + dy;
651 if (newYBottom < newYTop) newYBottom = newYTop; 659 if (newYBottom < newYTop) newYBottom = newYTop;
652 setCellY(newYTop, newYBottom); 660 setCellY(newYTop, newYBottom);
653} 661}
654 662
655void KOAgendaItem::expandLeft(int dx) 663void KOAgendaItem::expandLeft(int dx)
656{ 664{
657 int newX = cellX() + dx; 665 int newX = cellX() + dx;
658 int newXWidth = cellXWidth(); 666 int newXWidth = cellXWidth();
659 if (newX > newXWidth) newX = newXWidth; 667 if (newX > newXWidth) newX = newXWidth;
660 setCellX(newX,newXWidth); 668 setCellX(newX,newXWidth);
661} 669}
662 670
663void KOAgendaItem::expandRight(int dx) 671void KOAgendaItem::expandRight(int dx)
664{ 672{
665 int newX = cellX(); 673 int newX = cellX();
666 int newXWidth = cellXWidth() + dx; 674 int newXWidth = cellXWidth() + dx;
667 if (newXWidth < newX) newXWidth = newX; 675 if (newXWidth < newX) newXWidth = newX;
668 setCellX(newX,newXWidth); 676 setCellX(newX,newXWidth);
669} 677}
670 678
671QToolTipGroup *KOAgendaItem::toolTipGroup() 679QToolTipGroup *KOAgendaItem::toolTipGroup()
672{ 680{
673 if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0); 681 if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
674 return mToolTipGroup; 682 return mToolTipGroup;
675} 683}
676 684
677void KOAgendaItem::dragEnterEvent( QDragEnterEvent *e ) 685void KOAgendaItem::dragEnterEvent( QDragEnterEvent *e )
678{ 686{
679#ifndef KORG_NODND 687#ifndef KORG_NODND
680 if ( ICalDrag::canDecode( e ) || VCalDrag::canDecode( e ) || 688 if ( ICalDrag::canDecode( e ) || VCalDrag::canDecode( e ) ||
681 !QTextDrag::canDecode( e ) ) { 689 !QTextDrag::canDecode( e ) ) {
682 e->ignore(); 690 e->ignore();
683 return; 691 return;
684 } 692 }
685 e->accept(); 693 e->accept();
686#endif 694#endif
687} 695}
688 696
689void KOAgendaItem::dropEvent( QDropEvent *e ) 697void KOAgendaItem::dropEvent( QDropEvent *e )
690{ 698{
691#ifndef KORG_NODND 699#ifndef KORG_NODND
692 QString text; 700 QString text;
693 if(QTextDrag::decode(e,text)) 701 if(QTextDrag::decode(e,text))
694 { 702 {
695 kdDebug() << "Dropped : " << text << endl; 703 kdDebug() << "Dropped : " << text << endl;
696 QStringList emails = QStringList::split(",",text); 704 QStringList emails = QStringList::split(",",text);
697 for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) { 705 for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) {
698 kdDebug() << " Email: " << (*it) << endl; 706 kdDebug() << " Email: " << (*it) << endl;
699 int pos = (*it).find("<"); 707 int pos = (*it).find("<");
700 QString name = (*it).left(pos); 708 QString name = (*it).left(pos);
701 QString email = (*it).mid(pos); 709 QString email = (*it).mid(pos);
702 if (!email.isEmpty()) { 710 if (!email.isEmpty()) {
703 mIncidence->addAttendee(new Attendee(name,email)); 711 mIncidence->addAttendee(new Attendee(name,email));
704 } 712 }
705 } 713 }
706 } 714 }
707#endif 715#endif
708} 716}
709 717
710 718
711QPtrList<KOAgendaItem> KOAgendaItem::conflictItems() 719QPtrList<KOAgendaItem> KOAgendaItem::conflictItems()
712{ 720{
713 return mConflictItems; 721 return mConflictItems;
714} 722}
715 723
716void KOAgendaItem::setConflictItems(QPtrList<KOAgendaItem> ci) 724void KOAgendaItem::setConflictItems(QPtrList<KOAgendaItem> ci)
717{ 725{
718 mConflictItems = ci; 726 mConflictItems = ci;
719 KOAgendaItem *item; 727 KOAgendaItem *item;
720 for ( item=mConflictItems.first(); item != 0; 728 for ( item=mConflictItems.first(); item != 0;
721 item=mConflictItems.next() ) { 729 item=mConflictItems.next() ) {
722 item->addConflictItem(this); 730 item->addConflictItem(this);
723 } 731 }
724} 732}
725 733
726void KOAgendaItem::addConflictItem(KOAgendaItem *ci) 734void KOAgendaItem::addConflictItem(KOAgendaItem *ci)
727{ 735{
728 if (mConflictItems.find(ci)<0) 736 if (mConflictItems.find(ci)<0)
729 mConflictItems.append(ci); 737 mConflictItems.append(ci);
730} 738}
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 32cc291..0548f14 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -1,475 +1,476 @@
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 <time.h> 24#include <time.h>
25#ifndef _WIN32_ 25#ifndef _WIN32_
26#include <unistd.h> 26#include <unistd.h>
27#endif 27#endif
28#include <qdir.h> 28#include <qdir.h>
29#include <qtextstream.h> 29#include <qtextstream.h>
30#include <qtextcodec.h> 30#include <qtextcodec.h>
31#include <qstring.h> 31#include <qstring.h>
32#include <qregexp.h> 32#include <qregexp.h>
33#include <qfont.h> 33#include <qfont.h>
34#include <qcolor.h> 34#include <qcolor.h>
35#include <qstringlist.h> 35#include <qstringlist.h>
36#include <stdlib.h> 36#include <stdlib.h>
37 37
38#include <kglobal.h> 38#include <kglobal.h>
39#include <kconfig.h> 39#include <kconfig.h>
40#include <klocale.h> 40#include <klocale.h>
41#include <kdebug.h> 41#include <kdebug.h>
42#include <kemailsettings.h> 42#include <kemailsettings.h>
43#include <kstaticdeleter.h> 43#include <kstaticdeleter.h>
44#include <libkdepim/kpimglobalprefs.h> 44#include <libkdepim/kpimglobalprefs.h>
45 45
46#include "koprefs.h" 46#include "koprefs.h"
47#include "mainwindow.h" 47#include "mainwindow.h"
48 48
49KOPrefs *KOPrefs::mInstance = 0; 49KOPrefs *KOPrefs::mInstance = 0;
50static KStaticDeleter<KOPrefs> insd; 50static KStaticDeleter<KOPrefs> insd;
51 51
52KOPrefs::KOPrefs() : 52KOPrefs::KOPrefs() :
53 KPimPrefs("korganizerrc") 53 KPimPrefs("korganizerrc")
54{ 54{
55 mCategoryColors.setAutoDelete(true); 55 mCategoryColors.setAutoDelete(true);
56 fillMailDefaults(); 56 fillMailDefaults();
57 mDefaultCategoryColor = QColor(175,210,255);//196,196,196); 57 mDefaultCategoryColor = QColor(175,210,255);//196,196,196);
58 QColor defaultHolidayColor = QColor(255,0,0); 58 QColor defaultHolidayColor = QColor(255,0,0);
59 QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); 59 QColor defaultHighlightColor = QColor(129,112,255);//64,64,255);
60 QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); 60 QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128);
61 QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); 61 QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
62 QColor defaultTodoDueTodayColor = QColor(255,220,100); 62 QColor defaultTodoDueTodayColor = QColor(255,220,100);
63 QColor defaultTodoOverdueColor = QColor(255,153,125); 63 QColor defaultTodoOverdueColor = QColor(255,153,125);
64 64
65 mTimeBarFont = QFont("helvetica",10);//,QFont::Bold); 65 mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
66 mDefaultViewFont = QFont("helvetica",10); 66 mDefaultViewFont = QFont("helvetica",10);
67 mDefaultMonthViewFont = QFont("helvetica",8); 67 mDefaultMonthViewFont = QFont("helvetica",8);
68 mMarcusBainsFont= QFont("helvetica",10); 68 mMarcusBainsFont= QFont("helvetica",10);
69 mDateNavigatorFont= QFont("helvetica",10, QFont::Bold); 69 mDateNavigatorFont= QFont("helvetica",10, QFont::Bold);
70 mEditBoxFont = QFont("helvetica",12); 70 mEditBoxFont = QFont("helvetica",12);
71 mJornalViewFont = QFont("helvetica",12); 71 mJornalViewFont = QFont("helvetica",12);
72 72
73 KPrefs::setCurrentGroup("General"); 73 KPrefs::setCurrentGroup("General");
74 74
75 75
76 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); 76 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
77 77
78 addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); 78 addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
79 addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true); 79 addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
80 addItemBool("ShowIconSearch",&mShowIconSearch,true); 80 addItemBool("ShowIconSearch",&mShowIconSearch,true);
81 addItemBool("ShowIconList",&mShowIconList,true); 81 addItemBool("ShowIconList",&mShowIconList,true);
82 addItemBool("ShowIconDay1",&mShowIconDay1,true); 82 addItemBool("ShowIconDay1",&mShowIconDay1,true);
83 addItemBool("ShowIconDay5",&mShowIconDay5,true); 83 addItemBool("ShowIconDay5",&mShowIconDay5,true);
84 addItemBool("ShowIconDay7",&mShowIconDay7,true); 84 addItemBool("ShowIconDay7",&mShowIconDay7,true);
85 addItemBool("ShowIconMonth",&mShowIconMonth,true); 85 addItemBool("ShowIconMonth",&mShowIconMonth,true);
86 addItemBool("ShowIconTodoview",&mShowIconTodoview,true); 86 addItemBool("ShowIconTodoview",&mShowIconTodoview,true);
87 addItemBool("ShowIconBackFast",&mShowIconBackFast,true); 87 addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
88 addItemBool("ShowIconBack",&mShowIconBack,true); 88 addItemBool("ShowIconBack",&mShowIconBack,true);
89 addItemBool("ShowIconToday",&mShowIconToday,true); 89 addItemBool("ShowIconToday",&mShowIconToday,true);
90 addItemBool("ShowIconForward",&mShowIconForward,true); 90 addItemBool("ShowIconForward",&mShowIconForward,true);
91 addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); 91 addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
92 addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true); 92 addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true);
93 addItemBool("ShowIconNextDays",&mShowIconNextDays,true); 93 addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
94 addItemBool("ShowIconNext",&mShowIconNext,true); 94 addItemBool("ShowIconNext",&mShowIconNext,true);
95 addItemBool("ShowIconJournal",&mShowIconJournal,true); 95 addItemBool("ShowIconJournal",&mShowIconJournal,true);
96 addItemBool("ShowIconStretch",&mShowIconStretch,true); 96 addItemBool("ShowIconStretch",&mShowIconStretch,true);
97 addItemInt("LastLoadedLanguage",&mOldLanguage,0); 97 addItemInt("LastLoadedLanguage",&mOldLanguage,0);
98 98
99 addItemBool("AskForQuit",&mAskForQuit,false); 99 addItemBool("AskForQuit",&mAskForQuit,false);
100 100
101#ifndef DESKTOP_VERSION 101#ifndef DESKTOP_VERSION
102 addItemBool("ShowFullMenu",&mShowFullMenu,false); 102 addItemBool("ShowFullMenu",&mShowFullMenu,false);
103#else 103#else
104 addItemBool("ShowFullMenu",&mShowFullMenu,true); 104 addItemBool("ShowFullMenu",&mShowFullMenu,true);
105#endif 105#endif
106 addItemBool("ToolBarHor",&mToolBarHor, true ); 106 addItemBool("ToolBarHor",&mToolBarHor, true );
107 addItemBool("ToolBarUp",&mToolBarUp, false ); 107 addItemBool("ToolBarUp",&mToolBarUp, false );
108 addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false ); 108 addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
109 addItemInt("Whats Next Days",&mWhatsNextDays,3); 109 addItemInt("Whats Next Days",&mWhatsNextDays,3);
110 addItemInt("Whats Next Prios",&mWhatsNextPrios,1); 110 addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
111 111
112 addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true); 112 addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
113 addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true); 113 addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true);
114 addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false); 114 addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false);
115 addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true); 115 addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
116 addItemInt("AllDay Size",&mAllDaySize,28); 116 addItemInt("AllDay Size",&mAllDaySize,28);
117 QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav"; 117 QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
118 addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm ); 118 addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
119 119
120 addItemStringList("LocationDefaults",&mLocationDefaults ); 120 addItemStringList("LocationDefaults",&mLocationDefaults );
121 addItemStringList("EventSummary User",&mEventSummaryUser); 121 addItemStringList("EventSummary User",&mEventSummaryUser);
122 addItemStringList("TodoSummary User",&mTodoSummaryUser); 122 addItemStringList("TodoSummary User",&mTodoSummaryUser);
123 123
124 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); 124 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
125 addItemBool("Enable Project View",&mEnableProjectView,false); 125 addItemBool("Enable Project View",&mEnableProjectView,false);
126 addItemBool("Auto Save",&mAutoSave,false); 126 addItemBool("Auto Save",&mAutoSave,false);
127 addItemInt("Auto Save Interval",&mAutoSaveInterval,3); 127 addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
128 addItemBool("Confirm Deletes",&mConfirm,true); 128 addItemBool("Confirm Deletes",&mConfirm,true);
129 addItemString("Archive File",&mArchiveFile); 129 addItemString("Archive File",&mArchiveFile);
130 addItemString("Html Export File",&mHtmlExportFile, 130 addItemString("Html Export File",&mHtmlExportFile,
131 QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html")); 131 QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
132 addItemBool("Html With Save",&mHtmlWithSave,false); 132 addItemBool("Html With Save",&mHtmlWithSave,false);
133 133
134 KPrefs::setCurrentGroup("Personal Settings"); 134 KPrefs::setCurrentGroup("Personal Settings");
135 135
136 addItemInt("Mail Client",&mMailClient,MailClientKMail); 136 addItemInt("Mail Client",&mMailClient,MailClientKMail);
137 addItemBool("Use Control Center Email",&mEmailControlCenter,false); 137 addItemBool("Use Control Center Email",&mEmailControlCenter,false);
138 addItemBool("Bcc",&mBcc,false); 138 addItemBool("Bcc",&mBcc,false);
139 139
140 KPrefs::setCurrentGroup("Time & Date"); 140 KPrefs::setCurrentGroup("Time & Date");
141 141
142 142
143 addItemInt("Default Start Time",&mStartTime,10); 143 addItemInt("Default Start Time",&mStartTime,10);
144 addItemInt("Default Duration",&mDefaultDuration,2); 144 addItemInt("Default Duration",&mDefaultDuration,2);
145 addItemInt("Default Alarm Time",&mAlarmTime,3); 145 addItemInt("Default Alarm Time",&mAlarmTime,3);
146 KPrefs::setCurrentGroup("AlarmSettings"); 146 KPrefs::setCurrentGroup("AlarmSettings");
147 addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20); 147 addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
148 addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7); 148 addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
149 addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5); 149 addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
150 addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3); 150 addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
151 151
152 152
153 KPrefs::setCurrentGroup("Calendar"); 153 KPrefs::setCurrentGroup("Calendar");
154 154
155 addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar); 155 addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
156 156
157 KPrefs::setCurrentGroup("Fonts"); 157 KPrefs::setCurrentGroup("Fonts");
158 // qDebug(" KPrefs::setCurrentGroup(Fonts); "); 158 // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
159 addItemFont("TimeBar Font",&mTimeBarFont); 159 addItemFont("TimeBar Font",&mTimeBarFont);
160 addItemFont("MonthView Font",&mMonthViewFont); 160 addItemFont("MonthView Font",&mMonthViewFont);
161 addItemFont("AgendaView Font",&mAgendaViewFont); 161 addItemFont("AgendaView Font",&mAgendaViewFont);
162 addItemFont("MarcusBains Font",&mMarcusBainsFont); 162 addItemFont("MarcusBains Font",&mMarcusBainsFont);
163 addItemFont("TimeLabels Font",&mTimeLabelsFont); 163 addItemFont("TimeLabels Font",&mTimeLabelsFont);
164 addItemFont("TodoView Font",&mTodoViewFont); 164 addItemFont("TodoView Font",&mTodoViewFont);
165 addItemFont("ListView Font",&mListViewFont); 165 addItemFont("ListView Font",&mListViewFont);
166 addItemFont("DateNavigator Font",&mDateNavigatorFont); 166 addItemFont("DateNavigator Font",&mDateNavigatorFont);
167 addItemFont("EditBox Font",&mEditBoxFont); 167 addItemFont("EditBox Font",&mEditBoxFont);
168 addItemFont("JournalView Font",&mJornalViewFont); 168 addItemFont("JournalView Font",&mJornalViewFont);
169 addItemFont("WhatsNextView Font",&mWhatsNextFont); 169 addItemFont("WhatsNextView Font",&mWhatsNextFont);
170 addItemFont("EventView Font",&mEventViewFont); 170 addItemFont("EventView Font",&mEventViewFont);
171 171
172 KPrefs::setCurrentGroup("RemoteSyncing"); 172 KPrefs::setCurrentGroup("RemoteSyncing");
173 addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" ); 173 addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );
174 addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 174 addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" );
175 addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 175 addItemBool("ShowSyncEvents",&mShowSyncEvents,false);
176 addItemInt("LastSyncTime",&mLastSyncTime,0); 176 addItemInt("LastSyncTime",&mLastSyncTime,0);
177 177
178#ifdef _WIN32_ 178#ifdef _WIN32_
179 QString hdp= locateLocal("data","korganizer")+"\\\\"; 179 QString hdp= locateLocal("data","korganizer")+"\\\\";
180#else 180#else
181 QString hdp= locateLocal("data","korganizer")+"/"; 181 QString hdp= locateLocal("data","korganizer")+"/";
182#endif 182#endif
183 183
184 KPrefs::setCurrentGroup("LoadSaveFileNames"); 184 KPrefs::setCurrentGroup("LoadSaveFileNames");
185 185
186 addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" ); 186 addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
187 addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" ); 187 addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
188 addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" ); 188 addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
189 addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" ); 189 addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
190 190
191 191
192 KPrefs::setCurrentGroup("Locale"); 192 KPrefs::setCurrentGroup("Locale");
193 addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 193 addItemBool("ShortDateInViewer",&mShortDateInViewer,false);
194 194
195 195
196 KPrefs::setCurrentGroup("Colors"); 196 KPrefs::setCurrentGroup("Colors");
197 addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor); 197 addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
198 addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor); 198 addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
199 addItemColor("Event Color",&mEventColor,mDefaultCategoryColor); 199 addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
200 addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) );
200 addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor); 201 addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
201 addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor); 202 addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
202 addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor); 203 addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
203 addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor); 204 addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
204 addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 )); 205 addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
205 addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 )); 206 addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
206 addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 )); 207 addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
207 addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 208 addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true);
208 addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true); 209 addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
209 addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 210 addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false);
210 addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 )); 211 addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
211 addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 )); 212 addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 ));
212 addItemBool("UseAppColors",&mUseAppColors,false); 213 addItemBool("UseAppColors",&mUseAppColors,false);
213 214
214 215
215 216
216 KPrefs::setCurrentGroup("Views"); 217 KPrefs::setCurrentGroup("Views");
217 addItemBool("Show Date Navigator",&mShowDateNavigator,true); 218 addItemBool("Show Date Navigator",&mShowDateNavigator,true);
218 addItemInt("Hour Size",&mHourSize,8); 219 addItemInt("Hour Size",&mHourSize,8);
219 addItemBool("Show Daily Recurrences",&mDailyRecur,true); 220 addItemBool("Show Daily Recurrences",&mDailyRecur,true);
220 addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); 221 addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
221 addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); 222 addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
222 addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); 223 addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
223 addItemBool("ShowShortMonthName",&mMonthShowShort,false); 224 addItemBool("ShowShortMonthName",&mMonthShowShort,false);
224 addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); 225 addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
225#ifdef DESKTOP_VERION 226#ifdef DESKTOP_VERION
226 addItemBool("Enable ToolTips",&mEnableToolTips,true); 227 addItemBool("Enable ToolTips",&mEnableToolTips,true);
227#else 228#else
228 addItemBool("Enable ToolTips",&mEnableToolTips,false); 229 addItemBool("Enable ToolTips",&mEnableToolTips,false);
229#endif 230#endif
230 addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); 231 addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
231 addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); 232 addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
232 addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true); 233 addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
233 addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true); 234 addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
234 addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true); 235 addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true);
235 addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false); 236 addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
236 addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); 237 addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
237 addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); 238 addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
238 addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); 239 addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
239 addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);; 240 addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
240 addItemBool("WNViewShowsPast",&mWNViewShowsPast,true); 241 addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
241 addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); 242 addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
242 addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); 243 addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
243 addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); 244 addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
244 addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); 245 addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
245 addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false); 246 addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
246 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false); 247 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false);
247 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false); 248 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
248 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false); 249 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
249#ifdef DESKTOP_VERSION 250#ifdef DESKTOP_VERSION
250 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true); 251 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
251#else 252#else
252 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false); 253 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
253#endif 254#endif
254 addItemInt("Day Begins",&mDayBegins,7); 255 addItemInt("Day Begins",&mDayBegins,7);
255 addItemInt("Working Hours Start",&mWorkingHoursStart,8); 256 addItemInt("Working Hours Start",&mWorkingHoursStart,8);
256 addItemInt("Working Hours End",&mWorkingHoursEnd,17); 257 addItemInt("Working Hours End",&mWorkingHoursEnd,17);
257 addItemBool("Exclude Holidays",&mExcludeHolidays,true); 258 addItemBool("Exclude Holidays",&mExcludeHolidays,true);
258 addItemBool("Exclude Saturdays",&mExcludeSaturdays,true); 259 addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
259 260
260 addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false); 261 addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
261 addItemBool("Full View Month",&mFullViewMonth,true); 262 addItemBool("Full View Month",&mFullViewMonth,true);
262 addItemBool("Full View Todo",&mFullViewTodo,true); 263 addItemBool("Full View Todo",&mFullViewTodo,true);
263 addItemBool("Quick Todo",&mEnableQuickTodo,false); 264 addItemBool("Quick Todo",&mEnableQuickTodo,false);
264 265
265 addItemInt("Next X Days",&mNextXDays,3); 266 addItemInt("Next X Days",&mNextXDays,3);
266 267
267 KPrefs::setCurrentGroup("Printer"); 268 KPrefs::setCurrentGroup("Printer");
268 269
269 KPrefs::setCurrentGroup("Layout"); 270 KPrefs::setCurrentGroup("Layout");
270 271
271 addItemBool("CompactDialogs",&mCompactDialogs,false); 272 addItemBool("CompactDialogs",&mCompactDialogs,false);
272 addItemBool("VerticalScreen",&mVerticalScreen,true); 273 addItemBool("VerticalScreen",&mVerticalScreen,true);
273 274
274 KPrefs::setCurrentGroup("KOrganizer Plugins"); 275 KPrefs::setCurrentGroup("KOrganizer Plugins");
275 276
276 addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays"); 277 addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
277 278
278 KPrefs::setCurrentGroup("Group Scheduling"); 279 KPrefs::setCurrentGroup("Group Scheduling");
279 280
280 addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail); 281 addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
281 addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend); 282 addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
282 addItemStringList("AdditionalMails",&mAdditionalMails,""); 283 addItemStringList("AdditionalMails",&mAdditionalMails,"");
283 addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto); 284 addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
284 addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto); 285 addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
285 addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto); 286 addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
286 addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto); 287 addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
287 addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto); 288 addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
288 289
289 KPrefs::setCurrentGroup( "Editors" ); 290 KPrefs::setCurrentGroup( "Editors" );
290 291
291 addItemStringList( "EventTemplates", &mEventTemplates ); 292 addItemStringList( "EventTemplates", &mEventTemplates );
292 addItemStringList( "TodoTemplates", &mTodoTemplates ); 293 addItemStringList( "TodoTemplates", &mTodoTemplates );
293 294
294 addItemInt("DestinationPolicy",&mDestination,standardDestination); 295 addItemInt("DestinationPolicy",&mDestination,standardDestination);
295 296
296 297
297 298
298} 299}
299 300
300 301
301KOPrefs::~KOPrefs() 302KOPrefs::~KOPrefs()
302{ 303{
303 if (mInstance == this) 304 if (mInstance == this)
304 mInstance = insd.setObject(0); 305 mInstance = insd.setObject(0);
305 306
306 //qDebug("KOPrefs::~KOPrefs() "); 307 //qDebug("KOPrefs::~KOPrefs() ");
307} 308}
308 309
309 310
310KOPrefs *KOPrefs::instance() 311KOPrefs *KOPrefs::instance()
311{ 312{
312 if (!mInstance) { 313 if (!mInstance) {
313 mInstance = insd.setObject(new KOPrefs()); 314 mInstance = insd.setObject(new KOPrefs());
314 mInstance->readConfig(); 315 mInstance->readConfig();
315 } 316 }
316 317
317 return mInstance; 318 return mInstance;
318} 319}
319 320
320void KOPrefs::usrSetDefaults() 321void KOPrefs::usrSetDefaults()
321{ 322{
322 323
323} 324}
324 325
325void KOPrefs::fillMailDefaults() 326void KOPrefs::fillMailDefaults()
326{ 327{
327 if (mName.isEmpty()) mName = i18n("Anonymous"); 328 if (mName.isEmpty()) mName = i18n("Anonymous");
328 if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere"); 329 if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere");
329} 330}
330 331
331void KOPrefs::setTimeZoneIdDefault() 332void KOPrefs::setTimeZoneIdDefault()
332{ 333{
333 ; 334 ;
334} 335}
335 336
336void KOPrefs::setCategoryDefaults() 337void KOPrefs::setCategoryDefaults()
337{ 338{
338 mCustomCategories.clear(); 339 mCustomCategories.clear();
339 mCustomCategories = getDefaultList(); 340 mCustomCategories = getDefaultList();
340 341
341 QStringList::Iterator it; 342 QStringList::Iterator it;
342 for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { 343 for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
343 setCategoryColor(*it,mDefaultCategoryColor); 344 setCategoryColor(*it,mDefaultCategoryColor);
344 } 345 }
345} 346}
346 347
347QStringList KOPrefs::getDefaultList() 348QStringList KOPrefs::getDefaultList()
348{ 349{
349 QStringList retval ; 350 QStringList retval ;
350 retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema") << i18n("Customer") 351 retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema") << i18n("Customer")
351 << i18n("Break")<< i18n("Breakfast")<< i18n("Competition")<< i18n("Dinner") 352 << i18n("Break")<< i18n("Breakfast")<< i18n("Competition")<< i18n("Dinner")
352 << i18n("Education")<< i18n("Family") << i18n("Favorites") << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts") 353 << i18n("Education")<< i18n("Family") << i18n("Favorites") << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts")
353 << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") 354 << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids")
354 << i18n("Lunch") << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel") 355 << i18n("Lunch") << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel")
355 << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping") 356 << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping")
356 << i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University") 357 << i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University")
357 << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ; 358 << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ;
358 retval.sort(); 359 retval.sort();
359 return retval; 360 return retval;
360} 361}
361 362
362void KOPrefs::usrReadConfig() 363void KOPrefs::usrReadConfig()
363{ 364{
364 config()->setGroup("General"); 365 config()->setGroup("General");
365 366
366 mCustomCategories = config()->readListEntry("Custom Categories"); 367 mCustomCategories = config()->readListEntry("Custom Categories");
367 if ( KPimGlobalPrefs::instance()->mPreferredLanguage != mOldLanguage ) { 368 if ( KPimGlobalPrefs::instance()->mPreferredLanguage != mOldLanguage ) {
368 mLocationDefaults.clear(); 369 mLocationDefaults.clear();
369 mEventSummaryUser.clear(); 370 mEventSummaryUser.clear();
370 mTodoSummaryUser.clear(); 371 mTodoSummaryUser.clear();
371 } 372 }
372 mOldLoadedLanguage = mOldLanguage ; 373 mOldLoadedLanguage = mOldLanguage ;
373 mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; 374 mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
374 if (mLocationDefaults.isEmpty()) { 375 if (mLocationDefaults.isEmpty()) {
375 mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") 376 mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach")
376 << i18n("University") << i18n("Restaurant") << i18n("Bar") << i18n("Conference room") << i18n("Cinema") << i18n("Lake") << i18n("Kindergarten") 377 << i18n("University") << i18n("Restaurant") << i18n("Bar") << i18n("Conference room") << i18n("Cinema") << i18n("Lake") << i18n("Kindergarten")
377 << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ; 378 << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
378 // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") 379 // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
379 mLocationDefaults.sort(); 380 mLocationDefaults.sort();
380 } 381 }
381 382
382 if (mEventSummaryUser.isEmpty()) { 383 if (mEventSummaryUser.isEmpty()) {
383 mEventSummaryUser = getDefaultList() ; 384 mEventSummaryUser = getDefaultList() ;
384 } 385 }
385 if (mTodoSummaryUser.isEmpty()) { 386 if (mTodoSummaryUser.isEmpty()) {
386 mTodoSummaryUser = getDefaultList() ; 387 mTodoSummaryUser = getDefaultList() ;
387 } 388 }
388 389
389 if (mCustomCategories.isEmpty()) setCategoryDefaults(); 390 if (mCustomCategories.isEmpty()) setCategoryDefaults();
390 391
391 config()->setGroup("Personal Settings"); 392 config()->setGroup("Personal Settings");
392 mName = config()->readEntry("user_name",""); 393 mName = config()->readEntry("user_name","");
393 mEmail = config()->readEntry("user_email",""); 394 mEmail = config()->readEntry("user_email","");
394 fillMailDefaults(); 395 fillMailDefaults();
395 396
396 config()->setGroup("Category Colors"); 397 config()->setGroup("Category Colors");
397 QStringList::Iterator it; 398 QStringList::Iterator it;
398 for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) { 399 for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
399 setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor)); 400 setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor));
400 401
401 } 402 }
402 403
403 KPimPrefs::usrReadConfig(); 404 KPimPrefs::usrReadConfig();
404} 405}
405 406
406 407
407void KOPrefs::usrWriteConfig() 408void KOPrefs::usrWriteConfig()
408{ 409{
409 config()->setGroup("General"); 410 config()->setGroup("General");
410 config()->writeEntry("Custom Categories",mCustomCategories); 411 config()->writeEntry("Custom Categories",mCustomCategories);
411 412
412 config()->setGroup("Personal Settings"); 413 config()->setGroup("Personal Settings");
413 config()->writeEntry("user_name",mName); 414 config()->writeEntry("user_name",mName);
414 config()->writeEntry("user_email",mEmail); 415 config()->writeEntry("user_email",mEmail);
415 416
416 config()->setGroup("Category Colors"); 417 config()->setGroup("Category Colors");
417 QDictIterator<QColor> it(mCategoryColors); 418 QDictIterator<QColor> it(mCategoryColors);
418 while (it.current()) { 419 while (it.current()) {
419 config()->writeEntry(it.currentKey(),*(it.current())); 420 config()->writeEntry(it.currentKey(),*(it.current()));
420 ++it; 421 ++it;
421 } 422 }
422 423
423 424
424 KPimPrefs::usrWriteConfig(); 425 KPimPrefs::usrWriteConfig();
425} 426}
426 427
427void KOPrefs::setCategoryColor(QString cat,const QColor & color) 428void KOPrefs::setCategoryColor(QString cat,const QColor & color)
428{ 429{
429 mCategoryColors.replace(cat,new QColor(color)); 430 mCategoryColors.replace(cat,new QColor(color));
430} 431}
431 432
432QColor *KOPrefs::categoryColor(QString cat) 433QColor *KOPrefs::categoryColor(QString cat)
433{ 434{
434 QColor *color = 0; 435 QColor *color = 0;
435 436
436 if (!cat.isEmpty()) color = mCategoryColors[cat]; 437 if (!cat.isEmpty()) color = mCategoryColors[cat];
437 438
438 if (color) return color; 439 if (color) return color;
439 else return &mDefaultCategoryColor; 440 else return &mDefaultCategoryColor;
440} 441}
441 442
442void KOPrefs::setFullName(const QString &name) 443void KOPrefs::setFullName(const QString &name)
443{ 444{
444 mName = name; 445 mName = name;
445} 446}
446 447
447void KOPrefs::setEmail(const QString &email) 448void KOPrefs::setEmail(const QString &email)
448{ 449{
449 //qDebug(" KOPrefs::setEmai*********** %s",email.latin1() ); 450 //qDebug(" KOPrefs::setEmai*********** %s",email.latin1() );
450 mEmail = email; 451 mEmail = email;
451} 452}
452 453
453QString KOPrefs::fullName() 454QString KOPrefs::fullName()
454{ 455{
455 if (mEmailControlCenter) { 456 if (mEmailControlCenter) {
456 KEMailSettings settings; 457 KEMailSettings settings;
457 return settings.getSetting(KEMailSettings::RealName); 458 return settings.getSetting(KEMailSettings::RealName);
458 } else { 459 } else {
459 return mName; 460 return mName;
460 } 461 }
461} 462}
462 463
463QString KOPrefs::email() 464QString KOPrefs::email()
464{ 465{
465 if (mEmailControlCenter) { 466 if (mEmailControlCenter) {
466 KEMailSettings settings; 467 KEMailSettings settings;
467 return settings.getSetting(KEMailSettings::EmailAddress); 468 return settings.getSetting(KEMailSettings::EmailAddress);
468 } else { 469 } else {
469 return mEmail; 470 return mEmail;
470 } 471 }
471} 472}
472KConfig* KOPrefs::getConfig() 473KConfig* KOPrefs::getConfig()
473{ 474{
474 return config(); 475 return config();
475} 476}
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index b3acda7..8b849fa 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -1,278 +1,279 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 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#ifndef KOPREFS_H 23#ifndef KOPREFS_H
24#define KOPREFS_H 24#define KOPREFS_H
25 25
26 26
27#include <libkdepim/kpimprefs.h> 27#include <libkdepim/kpimprefs.h>
28#include <qdict.h> 28#include <qdict.h>
29 29
30class KConfig; 30class KConfig;
31class QFont; 31class QFont;
32class QColor; 32class QColor;
33class QStringList; 33class QStringList;
34 34
35class KOPrefs : public KPimPrefs 35class KOPrefs : public KPimPrefs
36{ 36{
37 public: 37 public:
38 enum { FormatVCalendar, FormatICalendar }; 38 enum { FormatVCalendar, FormatICalendar };
39 enum { MailClientKMail, MailClientSendmail }; 39 enum { MailClientKMail, MailClientSendmail };
40 enum { IMIPDummy, IMIPKMail }; 40 enum { IMIPDummy, IMIPKMail };
41 enum { IMIPOutbox, IMIPdirectsend }; 41 enum { IMIPOutbox, IMIPdirectsend };
42 enum { neverAuto, addressbookAuto, selectedAuto }; 42 enum { neverAuto, addressbookAuto, selectedAuto };
43 enum { standardDestination, askDestination }; 43 enum { standardDestination, askDestination };
44 44
45 virtual ~KOPrefs(); 45 virtual ~KOPrefs();
46 46
47 /** Get instance of KOPrefs. It is made sure that there is only one 47 /** Get instance of KOPrefs. It is made sure that there is only one
48 instance. */ 48 instance. */
49 static KOPrefs *instance(); 49 static KOPrefs *instance();
50 50
51 /** Set preferences to default values */ 51 /** Set preferences to default values */
52 void usrSetDefaults(); 52 void usrSetDefaults();
53 53
54 /** Read preferences from config file */ 54 /** Read preferences from config file */
55 void usrReadConfig(); 55 void usrReadConfig();
56 56
57 /** Write preferences to config file */ 57 /** Write preferences to config file */
58 void usrWriteConfig(); 58 void usrWriteConfig();
59 void setCategoryDefaults(); 59 void setCategoryDefaults();
60 60
61 protected: 61 protected:
62 void setTimeZoneIdDefault(); 62 void setTimeZoneIdDefault();
63 63
64 /** Fill empty mail fields with default values. */ 64 /** Fill empty mail fields with default values. */
65 void fillMailDefaults(); 65 void fillMailDefaults();
66 66
67 private: 67 private:
68 /** Constructor disabled for public. Use instance() to create a KOPrefs 68 /** Constructor disabled for public. Use instance() to create a KOPrefs
69 object. */ 69 object. */
70 KOPrefs(); 70 KOPrefs();
71 71
72 static KOPrefs *mInstance; 72 static KOPrefs *mInstance;
73 QStringList getDefaultList(); 73 QStringList getDefaultList();
74 public: 74 public:
75 // preferences data 75 // preferences data
76 KConfig* getConfig(); 76 KConfig* getConfig();
77 void setFullName(const QString &); 77 void setFullName(const QString &);
78 QString fullName(); 78 QString fullName();
79 void setEmail(const QString &); 79 void setEmail(const QString &);
80 QString email(); 80 QString email();
81 81
82 QString mAdditional; 82 QString mAdditional;
83 83
84 bool mEmailControlCenter; 84 bool mEmailControlCenter;
85 85
86 bool mBcc; 86 bool mBcc;
87 bool mAutoSave; 87 bool mAutoSave;
88 int mAutoSaveInterval; 88 int mAutoSaveInterval;
89 bool mConfirm; 89 bool mConfirm;
90 90
91 bool mEnableGroupScheduling; 91 bool mEnableGroupScheduling;
92 bool mEnableProjectView; 92 bool mEnableProjectView;
93 93
94 int mDefaultFormat; 94 int mDefaultFormat;
95 int mMailClient; 95 int mMailClient;
96 96
97 int mStartTime; 97 int mStartTime;
98 int mDefaultDuration; 98 int mDefaultDuration;
99 int mAlarmTime; 99 int mAlarmTime;
100 100
101 int mWorkingHoursStart; 101 int mWorkingHoursStart;
102 int mWorkingHoursEnd; 102 int mWorkingHoursEnd;
103 bool mExcludeHolidays; 103 bool mExcludeHolidays;
104 bool mExcludeSaturdays; 104 bool mExcludeSaturdays;
105 bool mMarcusBainsShowSeconds; 105 bool mMarcusBainsShowSeconds;
106 106
107 QFont mTimeBarFont; 107 QFont mTimeBarFont;
108 QFont mMonthViewFont; 108 QFont mMonthViewFont;
109 QFont mAgendaViewFont; 109 QFont mAgendaViewFont;
110 QFont mMarcusBainsFont; 110 QFont mMarcusBainsFont;
111 QFont mTimeLabelsFont; 111 QFont mTimeLabelsFont;
112 QFont mTodoViewFont; 112 QFont mTodoViewFont;
113 QFont mListViewFont; 113 QFont mListViewFont;
114 QFont mDateNavigatorFont; 114 QFont mDateNavigatorFont;
115 QFont mEditBoxFont; 115 QFont mEditBoxFont;
116 QFont mJornalViewFont; 116 QFont mJornalViewFont;
117 QFont mWhatsNextFont; 117 QFont mWhatsNextFont;
118 QFont mEventViewFont; 118 QFont mEventViewFont;
119 119
120 120
121 121
122 122
123 QColor mHolidayColor; 123 QColor mHolidayColor;
124 QColor mHighlightColor; 124 QColor mHighlightColor;
125 QColor mEventColor; 125 QColor mEventColor;
126 QColor mTodoDoneColor;
126 QColor mAgendaBgColor; 127 QColor mAgendaBgColor;
127 QColor mWorkingHoursColor; 128 QColor mWorkingHoursColor;
128 QColor mTodoDueTodayColor; 129 QColor mTodoDueTodayColor;
129 QColor mTodoOverdueColor; 130 QColor mTodoOverdueColor;
130 QColor mMonthViewEvenColor; 131 QColor mMonthViewEvenColor;
131 QColor mMonthViewOddColor; 132 QColor mMonthViewOddColor;
132 QColor mMonthViewHolidayColor; 133 QColor mMonthViewHolidayColor;
133 bool mMonthViewUsesDayColors; 134 bool mMonthViewUsesDayColors;
134 bool mMonthViewSatSunTog; 135 bool mMonthViewSatSunTog;
135 QColor mAppColor1; 136 QColor mAppColor1;
136 QColor mAppColor2; 137 QColor mAppColor2;
137 bool mUseAppColors; 138 bool mUseAppColors;
138 139
139 int mDayBegins; 140 int mDayBegins;
140 int mHourSize; 141 int mHourSize;
141 int mAllDaySize; 142 int mAllDaySize;
142 bool mShowFullMenu; 143 bool mShowFullMenu;
143 bool mDailyRecur; 144 bool mDailyRecur;
144 bool mWeeklyRecur; 145 bool mWeeklyRecur;
145 bool mMonthDailyRecur; 146 bool mMonthDailyRecur;
146 bool mMonthWeeklyRecur; 147 bool mMonthWeeklyRecur;
147 bool mMonthShowIcons; 148 bool mMonthShowIcons;
148 bool mMonthShowShort; 149 bool mMonthShowShort;
149 bool mEnableToolTips; 150 bool mEnableToolTips;
150 bool mEnableMonthScroll; 151 bool mEnableMonthScroll;
151 bool mFullViewMonth; 152 bool mFullViewMonth;
152 bool mMonthViewUsesCategoryColor; 153 bool mMonthViewUsesCategoryColor;
153 bool mFullViewTodo; 154 bool mFullViewTodo;
154 bool mShowCompletedTodo; 155 bool mShowCompletedTodo;
155 bool mMarcusBainsEnabled; 156 bool mMarcusBainsEnabled;
156 int mNextXDays; 157 int mNextXDays;
157 int mWhatsNextDays; 158 int mWhatsNextDays;
158 int mWhatsNextPrios; 159 int mWhatsNextPrios;
159 bool mEnableQuickTodo; 160 bool mEnableQuickTodo;
160 161
161 bool mCompactDialogs; 162 bool mCompactDialogs;
162 bool mVerticalScreen; 163 bool mVerticalScreen;
163 164
164 bool mShowIconNewTodo; 165 bool mShowIconNewTodo;
165 bool mShowIconNewEvent; 166 bool mShowIconNewEvent;
166 bool mShowIconSearch; 167 bool mShowIconSearch;
167 bool mShowIconList; 168 bool mShowIconList;
168 bool mShowIconDay1; 169 bool mShowIconDay1;
169 bool mShowIconDay5; 170 bool mShowIconDay5;
170 bool mShowIconDay7; 171 bool mShowIconDay7;
171 bool mShowIconMonth; 172 bool mShowIconMonth;
172 bool mShowIconTodoview; 173 bool mShowIconTodoview;
173 bool mShowIconBackFast; 174 bool mShowIconBackFast;
174 bool mShowIconBack; 175 bool mShowIconBack;
175 bool mShowIconToday; 176 bool mShowIconToday;
176 bool mShowIconForward; 177 bool mShowIconForward;
177 bool mShowIconForwardFast; 178 bool mShowIconForwardFast;
178 bool mShowIconWhatsThis; 179 bool mShowIconWhatsThis;
179 bool mShowIconNextDays; 180 bool mShowIconNextDays;
180 bool mShowIconNext; 181 bool mShowIconNext;
181 bool mShowIconJournal; 182 bool mShowIconJournal;
182 183
183 bool mShowIconStretch; 184 bool mShowIconStretch;
184 185
185 bool mToolBarHor; 186 bool mToolBarHor;
186 bool mToolBarUp; 187 bool mToolBarUp;
187 bool mToolBarMiniIcons; 188 bool mToolBarMiniIcons;
188 189
189 bool mAskForQuit; 190 bool mAskForQuit;
190 bool mUsePassWd; 191 bool mUsePassWd;
191 bool mShowSyncEvents; 192 bool mShowSyncEvents;
192 bool mShowTodoInAgenda; 193 bool mShowTodoInAgenda;
193 bool mShowTimeInAgenda; 194 bool mShowTimeInAgenda;
194 bool mHideNonStartedTodos; 195 bool mHideNonStartedTodos;
195 196
196 int mLastSyncTime; 197 int mLastSyncTime;
197 void setCategoryColor(QString cat,const QColor & color); 198 void setCategoryColor(QString cat,const QColor & color);
198 QColor *categoryColor(QString cat); 199 QColor *categoryColor(QString cat);
199 200
200 QString mArchiveFile; 201 QString mArchiveFile;
201 QString mHtmlExportFile; 202 QString mHtmlExportFile;
202 bool mHtmlWithSave; 203 bool mHtmlWithSave;
203 204
204 QStringList mSelectedPlugins; 205 QStringList mSelectedPlugins;
205 206
206 QString mLastImportFile; 207 QString mLastImportFile;
207 QString mLastVcalFile; 208 QString mLastVcalFile;
208 QString mLastSaveFile; 209 QString mLastSaveFile;
209 QString mLastLoadFile; 210 QString mLastLoadFile;
210 211
211 212
212 QString mDefaultAlarmFile; 213 QString mDefaultAlarmFile;
213 int mIMIPScheduler; 214 int mIMIPScheduler;
214 int mIMIPSend; 215 int mIMIPSend;
215 QStringList mAdditionalMails; 216 QStringList mAdditionalMails;
216 int mIMIPAutoRefresh; 217 int mIMIPAutoRefresh;
217 int mIMIPAutoInsertReply; 218 int mIMIPAutoInsertReply;
218 int mIMIPAutoInsertRequest; 219 int mIMIPAutoInsertRequest;
219 int mIMIPAutoFreeBusy; 220 int mIMIPAutoFreeBusy;
220 int mIMIPAutoFreeBusyReply; 221 int mIMIPAutoFreeBusyReply;
221 222
222 QStringList mTodoTemplates; 223 QStringList mTodoTemplates;
223 QStringList mEventTemplates; 224 QStringList mEventTemplates;
224 225
225 int mDestination; 226 int mDestination;
226 227
227 228
228 bool mEditOnDoubleClick; 229 bool mEditOnDoubleClick;
229 bool mViewChangeHoldFullscreen; 230 bool mViewChangeHoldFullscreen;
230 bool mViewChangeHoldNonFullscreen; 231 bool mViewChangeHoldNonFullscreen;
231 bool mCenterOnCurrentTime; 232 bool mCenterOnCurrentTime;
232 bool mSetTimeToDayStartAt; 233 bool mSetTimeToDayStartAt;
233 bool mHighlightCurrentDay; 234 bool mHighlightCurrentDay;
234 bool mUseHighlightLightColor; 235 bool mUseHighlightLightColor;
235 bool mListViewMonthTimespan; 236 bool mListViewMonthTimespan;
236 bool mWNViewShowsParents; 237 bool mWNViewShowsParents;
237 bool mWNViewShowsPast; 238 bool mWNViewShowsPast;
238 bool mWNViewShowLocation; 239 bool mWNViewShowLocation;
239 bool mTodoViewShowsPercentage; 240 bool mTodoViewShowsPercentage;
240 bool mTodoViewUsesCatColors; 241 bool mTodoViewUsesCatColors;
241 bool mTodoViewUsesSmallFont; 242 bool mTodoViewUsesSmallFont;
242 bool mTodoViewUsesForegroundColor; 243 bool mTodoViewUsesForegroundColor;
243 bool mMonthViewUsesForegroundColor; 244 bool mMonthViewUsesForegroundColor;
244 245
245 bool mHightlightDateTimeEdit; 246 bool mHightlightDateTimeEdit;
246 bool mShortDateInViewer; 247 bool mShortDateInViewer;
247 248
248 bool mShowDateNavigator; 249 bool mShowDateNavigator;
249 250
250 QStringList mLocationDefaults; 251 QStringList mLocationDefaults;
251 QStringList mEventSummaryUser; 252 QStringList mEventSummaryUser;
252 QStringList mTodoSummaryUser; 253 QStringList mTodoSummaryUser;
253 254
254 bool mUseInternalAlarmNotification; 255 bool mUseInternalAlarmNotification;
255 int mAlarmPlayBeeps; 256 int mAlarmPlayBeeps;
256 int mAlarmSuspendTime; 257 int mAlarmSuspendTime;
257 int mAlarmSuspendCount; 258 int mAlarmSuspendCount;
258 int mAlarmBeepInterval; 259 int mAlarmBeepInterval;
259 int mOldLanguage; 260 int mOldLanguage;
260 int mOldLoadedLanguage; 261 int mOldLoadedLanguage;
261 262
262 263
263 QString mActiveSyncPort; 264 QString mActiveSyncPort;
264 QString mActiveSyncIP; 265 QString mActiveSyncIP;
265 266
266 private: 267 private:
267 QDict<QColor> mCategoryColors; 268 QDict<QColor> mCategoryColors;
268 QColor mDefaultCategoryColor; 269 QColor mDefaultCategoryColor;
269 270
270 QFont mDefaultTimeBarFont; 271 QFont mDefaultTimeBarFont;
271 QFont mDefaultViewFont; 272 QFont mDefaultViewFont;
272 QFont mDefaultMonthViewFont; 273 QFont mDefaultMonthViewFont;
273 274
274 QString mName; 275 QString mName;
275 QString mEmail; 276 QString mEmail;
276}; 277};
277 278
278#endif 279#endif
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 1b24f56..580dff2 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -411,1249 +411,1255 @@ void KOPrefsDialog::setupMainTab()
411 // addWidBool(i18n("Enable automatic saving of calendar"), 411 // addWidBool(i18n("Enable automatic saving of calendar"),
412 // &(KOPrefs::instance()->mAutoSave),autoSaveGroup); 412 // &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
413 413
414 QHBox *intervalBox = new QHBox(topFrame); 414 QHBox *intervalBox = new QHBox(topFrame);
415 // intervalBox->setSpacing(spacingHint()); 415 // intervalBox->setSpacing(spacingHint());
416 topLayout->addMultiCellWidget(intervalBox,6,6,0,1); 416 topLayout->addMultiCellWidget(intervalBox,6,6,0,1);
417 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox); 417 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
418 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox); 418 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
419 autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); 419 autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin);
420 /* 420 /*
421 QHBox * agendasize = new QHBox ( topFrame ); 421 QHBox * agendasize = new QHBox ( topFrame );
422 422
423 new QLabel (i18n("AllDayAgenda Height:"), agendasize ); 423 new QLabel (i18n("AllDayAgenda Height:"), agendasize );
424 424
425 425
426 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize); 426 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize);
427 topLayout->addMultiCellWidget(agendasize,7,7,0,1); 427 topLayout->addMultiCellWidget(agendasize,7,7,0,1);
428 */ 428 */
429 KPrefsDialogWidBool *verticalScreen = 429 KPrefsDialogWidBool *verticalScreen =
430 addWidBool(i18n("Show vertical screen (Needs restart)"), 430 addWidBool(i18n("Show vertical screen (Needs restart)"),
431 &(KOPrefs::instance()->mVerticalScreen),topFrame); 431 &(KOPrefs::instance()->mVerticalScreen),topFrame);
432 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0); 432 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
433 topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1); 433 topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1);
434 434
435 KPrefsDialogWidBool *ask = 435 KPrefsDialogWidBool *ask =
436 addWidBool(i18n("Ask for quit when closing KO/Pi"), 436 addWidBool(i18n("Ask for quit when closing KO/Pi"),
437 &(KOPrefs::instance()->mAskForQuit),topFrame); 437 &(KOPrefs::instance()->mAskForQuit),topFrame);
438 topLayout->addMultiCellWidget(ask->checkBox(),8,8,0,1); 438 topLayout->addMultiCellWidget(ask->checkBox(),8,8,0,1);
439 439
440 440
441 /* 441 /*
442 KPrefsDialogWidBool *confirmCheck = 442 KPrefsDialogWidBool *confirmCheck =
443 addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm), 443 addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
444 topFrame); 444 topFrame);
445 topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1); 445 topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1);
446 446
447 447
448 mEnableGroupScheduling = 448 mEnableGroupScheduling =
449 addWidBool(i18n("Enable group scheduling"), 449 addWidBool(i18n("Enable group scheduling"),
450 &(KOPrefs::instance()->mEnableGroupScheduling),topFrame); 450 &(KOPrefs::instance()->mEnableGroupScheduling),topFrame);
451 topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0); 451 topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0);
452 connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()), 452 connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()),
453 SLOT(warningGroupScheduling())); 453 SLOT(warningGroupScheduling()));
454 454
455 mEnableProjectView = 455 mEnableProjectView =
456 addWidBool(i18n("Enable project view"), 456 addWidBool(i18n("Enable project view"),
457 &(KOPrefs::instance()->mEnableProjectView),topFrame); 457 &(KOPrefs::instance()->mEnableProjectView),topFrame);
458 topLayout->addWidget(mEnableProjectView->checkBox(),9,0); 458 topLayout->addWidget(mEnableProjectView->checkBox(),9,0);
459 connect(mEnableProjectView->checkBox(),SIGNAL(clicked()), 459 connect(mEnableProjectView->checkBox(),SIGNAL(clicked()),
460 SLOT(warningProjectView())); 460 SLOT(warningProjectView()));
461 461
462 // Can't be disabled anymore 462 // Can't be disabled anymore
463 mEnableGroupScheduling->checkBox()->hide(); 463 mEnableGroupScheduling->checkBox()->hide();
464 464
465 // Disable setting, because this feature now becomes stable 465 // Disable setting, because this feature now becomes stable
466 mEnableProjectView->checkBox()->hide(); 466 mEnableProjectView->checkBox()->hide();
467 467
468 KPrefsDialogWidRadios *defaultFormatGroup = 468 KPrefsDialogWidRadios *defaultFormatGroup =
469 addWidRadios(i18n("Default Calendar Format"), 469 addWidRadios(i18n("Default Calendar Format"),
470 &(KOPrefs::instance()->mDefaultFormat),topFrame); 470 &(KOPrefs::instance()->mDefaultFormat),topFrame);
471 defaultFormatGroup->addRadio(i18n("vCalendar")); 471 defaultFormatGroup->addRadio(i18n("vCalendar"));
472 defaultFormatGroup->addRadio(i18n("iCalendar")); 472 defaultFormatGroup->addRadio(i18n("iCalendar"));
473 473
474 topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1); 474 topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1);
475 475
476 // Default format unconditionally is iCalendar 476 // Default format unconditionally is iCalendar
477 defaultFormatGroup->groupBox()->hide(); 477 defaultFormatGroup->groupBox()->hide();
478 478
479 KPrefsDialogWidRadios *mailClientGroup = 479 KPrefsDialogWidRadios *mailClientGroup =
480 addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient), 480 addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient),
481 topFrame); 481 topFrame);
482 mailClientGroup->addRadio(i18n("KMail")); 482 mailClientGroup->addRadio(i18n("KMail"));
483 mailClientGroup->addRadio(i18n("Sendmail")); 483 mailClientGroup->addRadio(i18n("Sendmail"));
484 topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1); 484 topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1);
485 485
486 KPrefsDialogWidBool *htmlsave = 486 KPrefsDialogWidBool *htmlsave =
487 addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave), 487 addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave),
488 topFrame); 488 topFrame);
489 topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1); 489 topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1);
490 490
491 KPrefsDialogWidRadios *destinationGroup = 491 KPrefsDialogWidRadios *destinationGroup =
492 addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination), 492 addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination),
493 topFrame); 493 topFrame);
494 destinationGroup->addRadio(i18n("be added to the standard resource")); 494 destinationGroup->addRadio(i18n("be added to the standard resource"));
495 destinationGroup->addRadio(i18n("be asked which resource to use")); 495 destinationGroup->addRadio(i18n("be asked which resource to use"));
496 topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1); 496 topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1);
497 497
498 topLayout->setRowStretch(14,1); 498 topLayout->setRowStretch(14,1);
499 */ 499 */
500} 500}
501 501
502 502
503void KOPrefsDialog::setupTimeTab() 503void KOPrefsDialog::setupTimeTab()
504{ 504{
505 QFrame *topFrame = addPage(i18n("Time"),0,0); 505 QFrame *topFrame = addPage(i18n("Time"),0,0);
506 // DesktopIcon("clock",KIcon::SizeMedium)); 506 // DesktopIcon("clock",KIcon::SizeMedium));
507 507
508 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 508 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
509 topLayout->setSpacing(spacingHint()); 509 topLayout->setSpacing(spacingHint());
510 topLayout->setMargin(marginHint()); 510 topLayout->setMargin(marginHint());
511 511
512 QHBox *dummy = new QHBox(topFrame); 512 QHBox *dummy = new QHBox(topFrame);
513 KPrefsDialogWidTime *dayBegins = 513 KPrefsDialogWidTime *dayBegins =
514 addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), 514 addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
515 dummy); 515 dummy);
516 //topLayout->addWidget(dayBegins->label(),2,0); 516 //topLayout->addWidget(dayBegins->label(),2,0);
517 517
518 //topLayout->addWidget(dayBegins->spinBox(),2,1); 518 //topLayout->addWidget(dayBegins->spinBox(),2,1);
519 topLayout->addMultiCellWidget(dummy,0,0,0,1); 519 topLayout->addMultiCellWidget(dummy,0,0,0,1);
520 520
521 topLayout->addWidget(new QLabel(i18n("Default appointment time:"), 521 topLayout->addWidget(new QLabel(i18n("Default appointment time:"),
522 topFrame),1,0); 522 topFrame),1,0);
523 mStartTimeSpin = new QSpinBox(0,23,1,topFrame); 523 mStartTimeSpin = new QSpinBox(0,23,1,topFrame);
524 mStartTimeSpin->setSuffix(":00"); 524 mStartTimeSpin->setSuffix(":00");
525 topLayout->addWidget(mStartTimeSpin,1,1); 525 topLayout->addWidget(mStartTimeSpin,1,1);
526 526
527 topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"), 527 topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"),
528 topFrame),2,0); 528 topFrame),2,0);
529 mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame); 529 mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame);
530 mDefaultDurationSpin->setSuffix(":00"); 530 mDefaultDurationSpin->setSuffix(":00");
531 topLayout->addWidget(mDefaultDurationSpin,2,1); 531 topLayout->addWidget(mDefaultDurationSpin,2,1);
532 532
533 QStringList alarmList; 533 QStringList alarmList;
534 alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes") 534 alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes")
535 << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours") << i18n("24 hours") ; 535 << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours") << i18n("24 hours") ;
536 topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame), 536 topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame),
537 3,0); 537 3,0);
538 mAlarmTimeCombo = new QComboBox(topFrame); 538 mAlarmTimeCombo = new QComboBox(topFrame);
539 mAlarmTimeCombo->insertStringList(alarmList); 539 mAlarmTimeCombo->insertStringList(alarmList);
540 topLayout->addWidget(mAlarmTimeCombo,3,1); 540 topLayout->addWidget(mAlarmTimeCombo,3,1);
541 541
542 542
543 QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal, 543 QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
544 i18n("Working Hours"), 544 i18n("Working Hours"),
545 topFrame); 545 topFrame);
546 topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1); 546 topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
547 workingHoursGroup->layout()->setSpacing( 0 ); 547 workingHoursGroup->layout()->setSpacing( 0 );
548 workingHoursGroup->layout()->setMargin( 4 ); 548 workingHoursGroup->layout()->setMargin( 4 );
549 QHBox *workStartBox = new QHBox(workingHoursGroup); 549 QHBox *workStartBox = new QHBox(workingHoursGroup);
550 // workStartBox->setMargin( 0 ); 550 // workStartBox->setMargin( 0 );
551 addWidTime(i18n("Daily starting hour:"), 551 addWidTime(i18n("Daily starting hour:"),
552 &(KOPrefs::instance()->mWorkingHoursStart),workStartBox); 552 &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
553 553
554 QHBox *workEndBox = new QHBox(workingHoursGroup); 554 QHBox *workEndBox = new QHBox(workingHoursGroup);
555 //workEndBox->setMargin( 0 ); 555 //workEndBox->setMargin( 0 );
556 addWidTime(i18n("Daily ending hour:"), 556 addWidTime(i18n("Daily ending hour:"),
557 &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox); 557 &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
558 QVBox *excludeBox = new QVBox(workingHoursGroup); 558 QVBox *excludeBox = new QVBox(workingHoursGroup);
559 //excludeBox->setMargin( 0 ); 559 //excludeBox->setMargin( 0 );
560 addWidBool(i18n("Exclude holidays"), 560 addWidBool(i18n("Exclude holidays"),
561 &(KOPrefs::instance()->mExcludeHolidays),excludeBox); 561 &(KOPrefs::instance()->mExcludeHolidays),excludeBox);
562 562
563 addWidBool(i18n("Exclude Saturdays"), 563 addWidBool(i18n("Exclude Saturdays"),
564 &(KOPrefs::instance()->mExcludeSaturdays),excludeBox); 564 &(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
565 565
566// KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"), 566// KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
567 // &(KOPrefs::instance()->mMarcusBainsShowSeconds), 567 // &(KOPrefs::instance()->mMarcusBainsShowSeconds),
568 // topFrame); 568 // topFrame);
569// topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0); 569// topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0);
570 570
571 // topLayout->setRowStretch(6,1); 571 // topLayout->setRowStretch(6,1);
572} 572}
573 573
574 574
575void KOPrefsDialog::setupViewsTab() 575void KOPrefsDialog::setupViewsTab()
576{ 576{
577 577
578 QFrame *topFrame = addPage(i18n("Views"),0,0); 578 QFrame *topFrame = addPage(i18n("Views"),0,0);
579 // DesktopIcon("viewmag",KIcon::SizeMedium)); 579 // DesktopIcon("viewmag",KIcon::SizeMedium));
580 580
581 QGridLayout *topLayout = new QGridLayout(topFrame,6,1); 581 QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
582 topLayout->setSpacing(spacingHint()); 582 topLayout->setSpacing(spacingHint());
583 topLayout->setMargin(marginHint()); 583 topLayout->setMargin(marginHint());
584 584
585// QBoxLayout *dayBeginsLayout = new QHBoxLayout; 585// QBoxLayout *dayBeginsLayout = new QHBoxLayout;
586// topLayout->addLayout(dayBeginsLayout,0,0); 586// topLayout->addLayout(dayBeginsLayout,0,0);
587 587
588// KPrefsDialogWidTime *dayBegins = 588// KPrefsDialogWidTime *dayBegins =
589// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), 589// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
590// topFrame); 590// topFrame);
591// dayBeginsLayout->addWidget(dayBegins->label()); 591// dayBeginsLayout->addWidget(dayBegins->label());
592// dayBeginsLayout->addStretch(1); 592// dayBeginsLayout->addStretch(1);
593// dayBeginsLayout->addWidget(dayBegins->spinBox()); 593// dayBeginsLayout->addWidget(dayBegins->spinBox());
594 594
595// QBoxLayout *nextDaysLayout = new QHBoxLayout; 595// QBoxLayout *nextDaysLayout = new QHBoxLayout;
596// topLayout->addLayout(nextDaysLayout,1,0); 596// topLayout->addLayout(nextDaysLayout,1,0);
597// nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame)); 597// nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame));
598// mNextXDaysSpin = new QSpinBox(2,14,1,topFrame); 598// mNextXDaysSpin = new QSpinBox(2,14,1,topFrame);
599// nextDaysLayout->addStretch(1); 599// nextDaysLayout->addStretch(1);
600// nextDaysLayout->addWidget(mNextXDaysSpin); 600// nextDaysLayout->addWidget(mNextXDaysSpin);
601 601
602 602
603 int ii = 0; 603 int ii = 0;
604 KPrefsDialogWidBool *dummy = 604 KPrefsDialogWidBool *dummy =
605 addWidBool(i18n("Edit item on doubleclick (if not, show)"), 605 addWidBool(i18n("Edit item on doubleclick (if not, show)"),
606 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame); 606 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame);
607 topLayout->addWidget(dummy->checkBox(),ii++,0); 607 topLayout->addWidget(dummy->checkBox(),ii++,0);
608 608
609 dummy = 609 dummy =
610 addWidBool(i18n("Show time in agenda items"), 610 addWidBool(i18n("Show time in agenda items"),
611 &(KOPrefs::instance()->mShowTimeInAgenda),topFrame); 611 &(KOPrefs::instance()->mShowTimeInAgenda),topFrame);
612 topLayout->addWidget(dummy->checkBox(),ii++,0); 612 topLayout->addWidget(dummy->checkBox(),ii++,0);
613 613
614 dummy = 614 dummy =
615 addWidBool(i18n("Highlight current day in agenda"), 615 addWidBool(i18n("Highlight current day in agenda"),
616 &(KOPrefs::instance()->mHighlightCurrentDay),topFrame); 616 &(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
617 topLayout->addWidget(dummy->checkBox(),ii++,0); 617 topLayout->addWidget(dummy->checkBox(),ii++,0);
618 618
619 dummy = 619 dummy =
620 addWidBool(i18n("Use light color for highlight current day"), 620 addWidBool(i18n("Use light color for highlight current day"),
621 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); 621 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
622 topLayout->addWidget(dummy->checkBox(),ii++,0); 622 topLayout->addWidget(dummy->checkBox(),ii++,0);
623 623
624 KPrefsDialogWidBool *dailyRecur = 624 KPrefsDialogWidBool *dailyRecur =
625 addWidBool(i18n("Show events that recur daily in date nav."), 625 addWidBool(i18n("Show events that recur daily in date nav."),
626 &(KOPrefs::instance()->mDailyRecur),topFrame); 626 &(KOPrefs::instance()->mDailyRecur),topFrame);
627 topLayout->addWidget(dailyRecur->checkBox(),ii++,0); 627 topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
628 628
629 KPrefsDialogWidBool *weeklyRecur = 629 KPrefsDialogWidBool *weeklyRecur =
630 addWidBool(i18n("Show ev. that recur weekly in date nav."), 630 addWidBool(i18n("Show ev. that recur weekly in date nav."),
631 &(KOPrefs::instance()->mWeeklyRecur),topFrame); 631 &(KOPrefs::instance()->mWeeklyRecur),topFrame);
632 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); 632 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
633 if ( QApplication::desktop()->width() > 640 ) { 633 if ( QApplication::desktop()->width() > 640 ) {
634 634
635 KPrefsDialogWidBool *enableToolTips = 635 KPrefsDialogWidBool *enableToolTips =
636 addWidBool(i18n("Enable tooltips displaying summary of ev."), 636 addWidBool(i18n("Enable tooltips displaying summary of ev."),
637 &(KOPrefs::instance()->mEnableToolTips),topFrame); 637 &(KOPrefs::instance()->mEnableToolTips),topFrame);
638 topLayout->addWidget(enableToolTips->checkBox(),ii++,0); 638 topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
639 639
640 } 640 }
641 641
642 KPrefsDialogWidBool *marcusBainsEnabled = 642 KPrefsDialogWidBool *marcusBainsEnabled =
643 addWidBool(i18n("Show Marcus Bains line"), 643 addWidBool(i18n("Show Marcus Bains line"),
644 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); 644 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
645 topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); 645 topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
646 646
647 647
648 // topLayout->addWidget(hourSizeGroup,ii++,0); 648 // topLayout->addWidget(hourSizeGroup,ii++,0);
649 // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0); 649 // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0);
650 //topLayout->setRowStretch(11,1); 650 //topLayout->setRowStretch(11,1);
651 651
652 652
653 653
654 654
655 655
656 656
657 topFrame = addPage(i18n("ViewChange"),0,0); 657 topFrame = addPage(i18n("ViewChange"),0,0);
658 // DesktopIcon("viewmag",KIcon::SizeMedium)); 658 // DesktopIcon("viewmag",KIcon::SizeMedium));
659 659
660 topLayout = new QGridLayout(topFrame,6,1); 660 topLayout = new QGridLayout(topFrame,6,1);
661 topLayout->setSpacing(spacingHint()); 661 topLayout->setSpacing(spacingHint());
662 topLayout->setMargin(marginHint()); 662 topLayout->setMargin(marginHint());
663 ii = 0; 663 ii = 0;
664 664
665 665
666 dummy = 666 dummy =
667 addWidBool(i18n("Hold fullscreen on view change"), 667 addWidBool(i18n("Hold fullscreen on view change"),
668 &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame); 668 &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame);
669 topLayout->addWidget(dummy->checkBox(),ii++,0); 669 topLayout->addWidget(dummy->checkBox(),ii++,0);
670 670
671 dummy = 671 dummy =
672 addWidBool(i18n("Hold non-fullscreen on view change"), 672 addWidBool(i18n("Hold non-fullscreen on view change"),
673 &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame); 673 &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame);
674 topLayout->addWidget(dummy->checkBox(),ii++,0); 674 topLayout->addWidget(dummy->checkBox(),ii++,0);
675 675
676 676
677 KPrefsDialogWidBool *fullViewTodo = 677 KPrefsDialogWidBool *fullViewTodo =
678 addWidBool(i18n("Event list view uses full window"), 678 addWidBool(i18n("Event list view uses full window"),
679 &(KOPrefs::instance()->mFullViewTodo),topFrame); 679 &(KOPrefs::instance()->mFullViewTodo),topFrame);
680 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0); 680 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
681 681
682 KPrefsDialogWidBool *fullViewMonth = 682 KPrefsDialogWidBool *fullViewMonth =
683 addWidBool(i18n("Next days view uses full window"), 683 addWidBool(i18n("Next days view uses full window"),
684 &(KOPrefs::instance()->mFullViewMonth),topFrame); 684 &(KOPrefs::instance()->mFullViewMonth),topFrame);
685 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); 685 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0);
686 686
687 dummy = 687 dummy =
688 addWidBool(i18n("Set agenda to DayBeginsAt on change"), 688 addWidBool(i18n("Set agenda to DayBeginsAt on change"),
689 &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); 689 &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame);
690 topLayout->addWidget(dummy->checkBox(),ii++,0); 690 topLayout->addWidget(dummy->checkBox(),ii++,0);
691 691
692 dummy = 692 dummy =
693 addWidBool(i18n("Set agenda to current time on change"), 693 addWidBool(i18n("Set agenda to current time on change"),
694 &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); 694 &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame);
695 topLayout->addWidget(dummy->checkBox(),ii++,0); 695 topLayout->addWidget(dummy->checkBox(),ii++,0);
696 696
697 dummy = 697 dummy =
698 addWidBool(i18n("Listview uses monthly timespan"), 698 addWidBool(i18n("Listview uses monthly timespan"),
699 &(KOPrefs::instance()->mListViewMonthTimespan),topFrame); 699 &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
700 topLayout->addWidget(dummy->checkBox(),ii++,0); 700 topLayout->addWidget(dummy->checkBox(),ii++,0);
701 dummy = 701 dummy =
702 addWidBool(i18n("Highlight selection in Time Edit"), 702 addWidBool(i18n("Highlight selection in Time Edit"),
703 &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame); 703 &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
704 topLayout->addWidget( dummy->checkBox(), ii++,0); 704 topLayout->addWidget( dummy->checkBox(), ii++,0);
705 705
706 706
707 707
708 708
709 709
710 topFrame = addPage(i18n("Month View"),0,0); 710 topFrame = addPage(i18n("Month View"),0,0);
711 // DesktopIcon("viewmag",KIcon::SizeMedium)); 711 // DesktopIcon("viewmag",KIcon::SizeMedium));
712 712
713 topLayout = new QGridLayout(topFrame,5,1); 713 topLayout = new QGridLayout(topFrame,5,1);
714 topLayout->setSpacing(spacingHint()); 714 topLayout->setSpacing(spacingHint());
715 topLayout->setMargin(marginHint()); 715 topLayout->setMargin(marginHint());
716 ii = 0; 716 ii = 0;
717 QLabel *lab; 717 QLabel *lab;
718 QHBox *habo = new QHBox( topFrame ); 718 QHBox *habo = new QHBox( topFrame );
719 if ( QApplication::desktop()->width() <= 480 ) { 719 if ( QApplication::desktop()->width() <= 480 ) {
720 lab = new QLabel ( i18n("Show events that recur "), topFrame ); 720 lab = new QLabel ( i18n("Show events that recur "), topFrame );
721 topLayout->addMultiCellWidget(lab,ii, ii,0,1); 721 topLayout->addMultiCellWidget(lab,ii, ii,0,1);
722 ii++; 722 ii++;
723 } else { 723 } else {
724 new QLabel ( i18n("Show events that recur "), habo ); 724 new QLabel ( i18n("Show events that recur "), habo );
725 } 725 }
726 dailyRecur = 726 dailyRecur =
727 addWidBool(i18n("daily"), 727 addWidBool(i18n("daily"),
728 &(KOPrefs::instance()->mMonthDailyRecur),habo); 728 &(KOPrefs::instance()->mMonthDailyRecur),habo);
729 // topLayout->addWidget(dailyRecur->checkBox(),ii++,0); 729 // topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
730 730
731 weeklyRecur = 731 weeklyRecur =
732 addWidBool(i18n("weekly"), 732 addWidBool(i18n("weekly"),
733 &(KOPrefs::instance()->mMonthWeeklyRecur),habo); 733 &(KOPrefs::instance()->mMonthWeeklyRecur),habo);
734 topLayout->addMultiCellWidget(habo,ii, ii,0,1); 734 topLayout->addMultiCellWidget(habo,ii, ii,0,1);
735 ii++; 735 ii++;
736 736
737 737
738 habo = new QHBox( topFrame ); 738 habo = new QHBox( topFrame );
739 if ( QApplication::desktop()->width() <= 480 ) { 739 if ( QApplication::desktop()->width() <= 480 ) {
740 lab = new QLabel (i18n("Show in every cell ") , topFrame ); 740 lab = new QLabel (i18n("Show in every cell ") , topFrame );
741 topLayout->addMultiCellWidget(lab,ii, ii,0,1); 741 topLayout->addMultiCellWidget(lab,ii, ii,0,1);
742 ii++; 742 ii++;
743 743
744 } else { 744 } else {
745 new QLabel ( i18n("Show in every cell "), habo ); 745 new QLabel ( i18n("Show in every cell "), habo );
746 } 746 }
747 weeklyRecur = 747 weeklyRecur =
748 addWidBool(i18n("short month"), 748 addWidBool(i18n("short month"),
749 &(KOPrefs::instance()->mMonthShowShort),habo); 749 &(KOPrefs::instance()->mMonthShowShort),habo);
750 weeklyRecur = 750 weeklyRecur =
751 addWidBool(i18n("icons"), 751 addWidBool(i18n("icons"),
752 &(KOPrefs::instance()->mMonthShowIcons),habo); 752 &(KOPrefs::instance()->mMonthShowIcons),habo);
753 753
754 topLayout->addMultiCellWidget(habo,ii, ii,0,1); 754 topLayout->addMultiCellWidget(habo,ii, ii,0,1);
755 ii++; 755 ii++;
756#ifdef DESKTOP_VERSION 756#ifdef DESKTOP_VERSION
757 KPrefsDialogWidBool *enableMonthScroll = 757 KPrefsDialogWidBool *enableMonthScroll =
758 addWidBool(i18n("Enable scrollbars in month view cells"), 758 addWidBool(i18n("Enable scrollbars in month view cells"),
759 &(KOPrefs::instance()->mEnableMonthScroll),topFrame); 759 &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
760 topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); 760 topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0);
761#endif 761#endif
762 762
763 dummy = 763 dummy =
764 addWidBool(i18n("Show Sat/Sun together"), 764 addWidBool(i18n("Show Sat/Sun together"),
765 &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); 765 &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame);
766 topLayout->addWidget(dummy->checkBox(),ii++,0); 766 topLayout->addWidget(dummy->checkBox(),ii++,0);
767 767
768 KPrefsDialogWidBool *coloredCategoriesInMonthView = 768 KPrefsDialogWidBool *coloredCategoriesInMonthView =
769 addWidBool(i18n("Month view uses category colors"), 769 addWidBool(i18n("Month view uses category colors"),
770 &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); 770 &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
771 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 771 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
772 772
773 dummy = 773 dummy =
774 addWidBool(i18n("Categorie colors are applied to text"), 774 addWidBool(i18n("Categorie colors are applied to text"),
775 &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); 775 &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
776 topLayout->addWidget(dummy->checkBox(),ii++,0); 776 topLayout->addWidget(dummy->checkBox(),ii++,0);
777 coloredCategoriesInMonthView = 777 coloredCategoriesInMonthView =
778 addWidBool(i18n("Month view uses day colors"), 778 addWidBool(i18n("Month view uses day colors"),
779 &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); 779 &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
780 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 780 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
781 781
782 KPrefsDialogWidColor *holidayColor = 782 KPrefsDialogWidColor *holidayColor =
783 addWidColor(i18n("Day color odd months"), 783 addWidColor(i18n("Day color odd months"),
784 &(KOPrefs::instance()->mMonthViewOddColor),topFrame); 784 &(KOPrefs::instance()->mMonthViewOddColor),topFrame);
785 topLayout->addWidget(holidayColor->label(),ii,0); 785 topLayout->addWidget(holidayColor->label(),ii,0);
786 topLayout->addWidget(holidayColor->button(),ii++,1); 786 topLayout->addWidget(holidayColor->button(),ii++,1);
787 787
788 holidayColor = 788 holidayColor =
789 addWidColor(i18n("Day color even months"), 789 addWidColor(i18n("Day color even months"),
790 &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); 790 &(KOPrefs::instance()->mMonthViewEvenColor),topFrame);
791 topLayout->addWidget(holidayColor->label(),ii,0); 791 topLayout->addWidget(holidayColor->label(),ii,0);
792 topLayout->addWidget(holidayColor->button(),ii++,1); 792 topLayout->addWidget(holidayColor->button(),ii++,1);
793 793
794 794
795 holidayColor = 795 holidayColor =
796 addWidColor(i18n("Color for Sundays + category \"Holiday\""), 796 addWidColor(i18n("Color for Sundays + category \"Holiday\""),
797 &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); 797 &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame);
798 topLayout->addWidget(holidayColor->label(),ii,0); 798 topLayout->addWidget(holidayColor->label(),ii,0);
799 topLayout->addWidget(holidayColor->button(),ii++,1); 799 topLayout->addWidget(holidayColor->button(),ii++,1);
800 // *********************** What'sNext View 800 // *********************** What'sNext View
801 topFrame = addPage(i18n("What's Next View"),0,0); 801 topFrame = addPage(i18n("What's Next View"),0,0);
802 // DesktopIcon("viewmag",KIcon::SizeMedium)); 802 // DesktopIcon("viewmag",KIcon::SizeMedium));
803 803
804 topLayout = new QGridLayout(topFrame,4,1); 804 topLayout = new QGridLayout(topFrame,4,1);
805 topLayout->setSpacing(spacingHint()); 805 topLayout->setSpacing(spacingHint());
806 topLayout->setMargin(marginHint()); 806 topLayout->setMargin(marginHint());
807 ii = 0; 807 ii = 0;
808 KPrefsDialogWidBool *passwdk = 808 KPrefsDialogWidBool *passwdk =
809 809
810 addWidBool(i18n("Show events, that are done in \nWhat's Next view"), 810 addWidBool(i18n("Show events, that are done in \nWhat's Next view"),
811 &(KOPrefs::instance()->mWNViewShowsPast),topFrame); 811 &(KOPrefs::instance()->mWNViewShowsPast),topFrame);
812 topLayout->addWidget(passwdk->checkBox(), ii++,0); 812 topLayout->addWidget(passwdk->checkBox(), ii++,0);
813 passwdk = 813 passwdk =
814 addWidBool(i18n("Show parent To-Do's in What's Next view"), 814 addWidBool(i18n("Show parent To-Do's in What's Next view"),
815 &(KOPrefs::instance()->mWNViewShowsParents),topFrame); 815 &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
816 topLayout->addWidget(passwdk->checkBox(), ii++,0); 816 topLayout->addWidget(passwdk->checkBox(), ii++,0);
817 817
818 passwdk = 818 passwdk =
819 addWidBool(i18n("Show location in What's Next view"), 819 addWidBool(i18n("Show location in What's Next view"),
820 &(KOPrefs::instance()->mWNViewShowLocation),topFrame); 820 &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
821 topLayout->addWidget(passwdk->checkBox(), ii++,0); 821 topLayout->addWidget(passwdk->checkBox(), ii++,0);
822 822
823 passwdk = 823 passwdk =
824 addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"), 824 addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"),
825 &(KOPrefs::instance()->mShowSyncEvents),topFrame); 825 &(KOPrefs::instance()->mShowSyncEvents),topFrame);
826 topLayout->addWidget(passwdk->checkBox(), ii++,0); 826 topLayout->addWidget(passwdk->checkBox(), ii++,0);
827 passwdk = 827 passwdk =
828 addWidBool(i18n("Use short date in \nWhat's Next/Event view"), 828 addWidBool(i18n("Use short date in \nWhat's Next/Event view"),
829 &(KOPrefs::instance()->mShortDateInViewer),topFrame); 829 &(KOPrefs::instance()->mShortDateInViewer),topFrame);
830 topLayout->addWidget(passwdk->checkBox(), ii++,0); 830 topLayout->addWidget(passwdk->checkBox(), ii++,0);
831 831
832 832
833 833
834 834
835 // *********************** Todo View 835 // *********************** Todo View
836 836
837 topFrame = addPage(i18n("Todo View"),0,0); 837 topFrame = addPage(i18n("Todo View"),0,0);
838 // DesktopIcon("viewmag",KIcon::SizeMedium)); 838 // DesktopIcon("viewmag",KIcon::SizeMedium));
839 839
840 topLayout = new QGridLayout(topFrame,4,1); 840 topLayout = new QGridLayout(topFrame,4,1);
841 topLayout->setSpacing(spacingHint()); 841 topLayout->setSpacing(spacingHint());
842 topLayout->setMargin(marginHint()); 842 topLayout->setMargin(marginHint());
843 ii = 0; 843 ii = 0;
844dummy = 844dummy =
845 addWidBool(i18n("Hide not running Todos in To-do view"), 845 addWidBool(i18n("Hide not running Todos in To-do view"),
846 &(KOPrefs::instance()->mHideNonStartedTodos),topFrame); 846 &(KOPrefs::instance()->mHideNonStartedTodos),topFrame);
847 topLayout->addWidget(dummy->checkBox(),ii++,0); 847 topLayout->addWidget(dummy->checkBox(),ii++,0);
848 848
849 849
850 KPrefsDialogWidBool *showCompletedTodo = 850 KPrefsDialogWidBool *showCompletedTodo =
851 addWidBool(i18n("To-do view shows completed Todos"), 851 addWidBool(i18n("To-do view shows completed Todos"),
852 &(KOPrefs::instance()->mShowCompletedTodo),topFrame); 852 &(KOPrefs::instance()->mShowCompletedTodo),topFrame);
853 topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0); 853 topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0);
854 dummy = 854 dummy =
855 addWidBool(i18n("To-do view shows complete as 'xx %'"), 855 addWidBool(i18n("To-do view shows complete as 'xx %'"),
856 &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame); 856 &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame);
857 topLayout->addWidget(dummy->checkBox(),ii++,0); 857 topLayout->addWidget(dummy->checkBox(),ii++,0);
858 858
859 dummy = 859 dummy =
860 addWidBool(i18n("Small To-do view uses smaller font"), 860 addWidBool(i18n("Small To-do view uses smaller font"),
861 &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame); 861 &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame);
862 topLayout->addWidget(dummy->checkBox(),ii++,0); 862 topLayout->addWidget(dummy->checkBox(),ii++,0);
863 863
864 864
865 865
866 dummy = 866 dummy =
867 addWidBool(i18n("Todo view uses category colors"), 867 addWidBool(i18n("Todo view uses category colors"),
868 &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame); 868 &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame);
869 topLayout->addWidget(dummy->checkBox(),ii++,0); 869 topLayout->addWidget(dummy->checkBox(),ii++,0);
870 870
871 871
872 QWidget* wid = new QWidget( topFrame ); 872 QWidget* wid = new QWidget( topFrame );
873 // Todo due today color 873 // Todo due today color
874 KPrefsDialogWidColor *todoDueTodayColor = 874 KPrefsDialogWidColor *todoDueTodayColor =
875 addWidColor(i18n("Todo due today color:"), 875 addWidColor(i18n("Todo due today color:"),
876 &(KOPrefs::instance()->mTodoDueTodayColor),wid); 876 &(KOPrefs::instance()->mTodoDueTodayColor),wid);
877 QHBoxLayout *widLayout = new QHBoxLayout(wid); 877 QHBoxLayout *widLayout = new QHBoxLayout(wid);
878 widLayout->addWidget( todoDueTodayColor->label() ); 878 widLayout->addWidget( todoDueTodayColor->label() );
879 widLayout->addWidget( todoDueTodayColor->button() ); 879 widLayout->addWidget( todoDueTodayColor->button() );
880 topLayout->addWidget(wid,ii++,0); 880 topLayout->addWidget(wid,ii++,0);
881 //topLayout->addWidget(todoDueTodayColor->button(),ii++,1); 881 //topLayout->addWidget(todoDueTodayColor->button(),ii++,1);
882 882
883 // Todo overdue color 883 // Todo overdue color
884 wid = new QWidget( topFrame ); 884 wid = new QWidget( topFrame );
885 widLayout = new QHBoxLayout(wid); 885 widLayout = new QHBoxLayout(wid);
886 KPrefsDialogWidColor *todoOverdueColor = 886 KPrefsDialogWidColor *todoOverdueColor =
887 addWidColor(i18n("Todo overdue color:"), 887 addWidColor(i18n("Todo overdue color:"),
888 &(KOPrefs::instance()->mTodoOverdueColor),wid); 888 &(KOPrefs::instance()->mTodoOverdueColor),wid);
889 widLayout->addWidget(todoOverdueColor->label()); 889 widLayout->addWidget(todoOverdueColor->label());
890 widLayout->addWidget(todoOverdueColor->button()); 890 widLayout->addWidget(todoOverdueColor->button());
891 topLayout->addWidget(wid,ii++,0); 891 topLayout->addWidget(wid,ii++,0);
892 892
893 dummy = 893 dummy =
894 addWidBool(i18n("Colors are applied to text"), 894 addWidBool(i18n("Colors are applied to text"),
895 &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame); 895 &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame);
896 topLayout->addWidget(dummy->checkBox(),ii++,0); 896 topLayout->addWidget(dummy->checkBox(),ii++,0);
897 897
898 dummy = 898 dummy =
899 addWidBool(i18n("Allday Agenda view shows todos"), 899 addWidBool(i18n("Allday Agenda view shows todos"),
900 &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); 900 &(KOPrefs::instance()->mShowTodoInAgenda),topFrame);
901 topLayout->addWidget(dummy->checkBox(),ii++,0); 901 topLayout->addWidget(dummy->checkBox(),ii++,0);
902 902
903 903
904 904
905 905
906 topFrame = addPage(i18n("Alarm"),0,0); 906 topFrame = addPage(i18n("Alarm"),0,0);
907 // DesktopIcon("viewmag",KIcon::SizeMedium)); 907 // DesktopIcon("viewmag",KIcon::SizeMedium));
908 908
909 topLayout = new QGridLayout(topFrame,2,1); 909 topLayout = new QGridLayout(topFrame,2,1);
910 topLayout->setSpacing(spacingHint()); 910 topLayout->setSpacing(spacingHint());
911 topLayout->setMargin(marginHint()); 911 topLayout->setMargin(marginHint());
912 int iii = 0; 912 int iii = 0;
913 913
914 dummy = 914 dummy =
915 addWidBool(i18n("Use internal alarm notification"), 915 addWidBool(i18n("Use internal alarm notification"),
916 &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame); 916 &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame);
917 topLayout->addWidget(dummy->checkBox(),iii++,0); 917 topLayout->addWidget(dummy->checkBox(),iii++,0);
918 lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame); 918 lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame);
919 919
920 topLayout->addWidget(lab ,iii++,0); 920 topLayout->addWidget(lab ,iii++,0);
921#ifndef DESKTOP_VERSION 921#ifndef DESKTOP_VERSION
922 lab->setAlignment( AlignLeft|WordBreak|AlignTop); 922 lab->setAlignment( AlignLeft|WordBreak|AlignTop);
923#else 923#else
924 lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); 924 lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
925 lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) ); 925 lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
926#endif 926#endif
927 927
928 QHBox* dummyBox = new QHBox(topFrame); 928 QHBox* dummyBox = new QHBox(topFrame);
929 new QLabel(i18n("Play beeps count:"),dummyBox); 929 new QLabel(i18n("Play beeps count:"),dummyBox);
930 mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox); 930 mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox);
931 topLayout->addWidget(dummyBox,iii++,0); 931 topLayout->addWidget(dummyBox,iii++,0);
932 932
933 dummyBox = new QHBox(topFrame); 933 dummyBox = new QHBox(topFrame);
934 new QLabel(i18n("Beeps interval in sec:"),dummyBox); 934 new QLabel(i18n("Beeps interval in sec:"),dummyBox);
935 mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox); 935 mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox);
936 topLayout->addWidget(dummyBox,iii++,0); 936 topLayout->addWidget(dummyBox,iii++,0);
937 937
938 dummyBox = new QHBox(topFrame); 938 dummyBox = new QHBox(topFrame);
939 new QLabel(i18n("Default suspend time in min:"),dummyBox); 939 new QLabel(i18n("Default suspend time in min:"),dummyBox);
940 mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox); 940 mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox);
941 topLayout->addWidget(dummyBox,iii++,0); 941 topLayout->addWidget(dummyBox,iii++,0);
942 942
943 dummyBox = new QHBox(topFrame); 943 dummyBox = new QHBox(topFrame);
944 new QLabel(i18n("Auto suspend count:"),dummyBox); 944 new QLabel(i18n("Auto suspend count:"),dummyBox);
945 mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox); 945 mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox);
946 topLayout->addWidget(dummyBox,iii++,0); 946 topLayout->addWidget(dummyBox,iii++,0);
947 947
948 948
949 949
950 950
951 951
952 952
953 953
954 QHBox* hbo = new QHBox ( topFrame ); 954 QHBox* hbo = new QHBox ( topFrame );
955 mDefaultAlarmFile = new QLineEdit(hbo); 955 mDefaultAlarmFile = new QLineEdit(hbo);
956 QPushButton * loadTemplate = new QPushButton(hbo); 956 QPushButton * loadTemplate = new QPushButton(hbo);
957 QPixmap icon; 957 QPixmap icon;
958 if ( QApplication::desktop()->width() < 321 ) 958 if ( QApplication::desktop()->width() < 321 )
959 icon = SmallIcon("fileimport16"); 959 icon = SmallIcon("fileimport16");
960 else 960 else
961 icon = SmallIcon("fileimport"); 961 icon = SmallIcon("fileimport");
962 loadTemplate->setIconSet (icon ) ; 962 loadTemplate->setIconSet (icon ) ;
963 connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( selectSoundFile() ) ); 963 connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( selectSoundFile() ) );
964 int size = loadTemplate->sizeHint().height(); 964 int size = loadTemplate->sizeHint().height();
965 loadTemplate->setFixedSize( size, size ); 965 loadTemplate->setFixedSize( size, size );
966 //lab = new QLabel( i18n("This setting is useless for 5500 user!"), topFrame); 966 //lab = new QLabel( i18n("This setting is useless for 5500 user!"), topFrame);
967 // topLayout->addWidget(lab ,iii++,0); 967 // topLayout->addWidget(lab ,iii++,0);
968 lab = new QLabel( i18n("Alarm *.wav file for newly created alarm:"), topFrame); 968 lab = new QLabel( i18n("Alarm *.wav file for newly created alarm:"), topFrame);
969 topLayout->addWidget(lab ,iii++,0); 969 topLayout->addWidget(lab ,iii++,0);
970 topLayout->addWidget(hbo,iii++,0); 970 topLayout->addWidget(hbo,iii++,0);
971 // lab = new QLabel( i18n("Note: This does not mean, that for every alarm this file is replayed. This file here is associated with a newly created alarm."), topFrame); 971 // lab = new QLabel( i18n("Note: This does not mean, that for every alarm this file is replayed. This file here is associated with a newly created alarm."), topFrame);
972 972
973// topLayout->addWidget(lab ,iii++,0); 973// topLayout->addWidget(lab ,iii++,0);
974// #ifndef DESKTOP_VERSION 974// #ifndef DESKTOP_VERSION
975// lab->setAlignment( AlignLeft|WordBreak|AlignTop); 975// lab->setAlignment( AlignLeft|WordBreak|AlignTop);
976// #else 976// #else
977// lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); 977// lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
978// lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) ); 978// lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
979// #endif 979// #endif
980 980
981 981
982} 982}
983 983
984void KOPrefsDialog::selectSoundFile() 984void KOPrefsDialog::selectSoundFile()
985{ 985{
986 QString fileName = mDefaultAlarmFile->text(); 986 QString fileName = mDefaultAlarmFile->text();
987 fileName = KFileDialog::getSaveFileName( mDefaultAlarmFile->text() , "Choose default alarm file", this ); 987 fileName = KFileDialog::getSaveFileName( mDefaultAlarmFile->text() , "Choose default alarm file", this );
988 if ( fileName.length() > 0 ) 988 if ( fileName.length() > 0 )
989 mDefaultAlarmFile->setText( fileName ); 989 mDefaultAlarmFile->setText( fileName );
990} 990}
991void KOPrefsDialog::setupFontsTab() 991void KOPrefsDialog::setupFontsTab()
992{ 992{
993 993
994 QFrame *topFrame = addPage(i18n("Fonts"),0,0); 994 QFrame *topFrame = addPage(i18n("Fonts"),0,0);
995 // DesktopIcon("fonts",KIcon::SizeMedium)); 995 // DesktopIcon("fonts",KIcon::SizeMedium));
996 996
997 QGridLayout *topLayout = new QGridLayout(topFrame,7,3); 997 QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
998 topLayout->setSpacing(1); 998 topLayout->setSpacing(1);
999 topLayout->setMargin(3); 999 topLayout->setMargin(3);
1000 KPrefsDialogWidFont * tVFont; 1000 KPrefsDialogWidFont * tVFont;
1001 int i = 0; 1001 int i = 0;
1002 KPrefsDialogWidFont *timeLabelsFont = 1002 KPrefsDialogWidFont *timeLabelsFont =
1003 addWidFont(i18n("23"),i18n("DateNavigator:(nr)"), 1003 addWidFont(i18n("23"),i18n("DateNavigator:(nr)"),
1004 &(KOPrefs::instance()->mDateNavigatorFont),topFrame); 1004 &(KOPrefs::instance()->mDateNavigatorFont),topFrame);
1005 topLayout->addWidget(timeLabelsFont->label(),i,0); 1005 topLayout->addWidget(timeLabelsFont->label(),i,0);
1006 topLayout->addWidget(timeLabelsFont->preview(),i,1); 1006 topLayout->addWidget(timeLabelsFont->preview(),i,1);
1007 topLayout->addWidget(timeLabelsFont->button(),i,2); 1007 topLayout->addWidget(timeLabelsFont->button(),i,2);
1008 ++i; 1008 ++i;
1009 1009
1010 1010
1011 timeLabelsFont = 1011 timeLabelsFont =
1012 addWidFont(i18n("Mon 15"),i18n("Date Labels:"), 1012 addWidFont(i18n("Mon 15"),i18n("Date Labels:"),
1013 &(KOPrefs::instance()->mTimeLabelsFont),topFrame); 1013 &(KOPrefs::instance()->mTimeLabelsFont),topFrame);
1014 topLayout->addWidget(timeLabelsFont->label(),i,0); 1014 topLayout->addWidget(timeLabelsFont->label(),i,0);
1015 topLayout->addWidget(timeLabelsFont->preview(),i,1); 1015 topLayout->addWidget(timeLabelsFont->preview(),i,1);
1016 topLayout->addWidget(timeLabelsFont->button(),i,2); 1016 topLayout->addWidget(timeLabelsFont->button(),i,2);
1017 ++i; 1017 ++i;
1018 1018
1019 KPrefsDialogWidFont *timeBarFont = 1019 KPrefsDialogWidFont *timeBarFont =
1020 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)),i18n("Time bar:"), 1020 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)),i18n("Time bar:"),
1021 &(KOPrefs::instance()->mTimeBarFont),topFrame); 1021 &(KOPrefs::instance()->mTimeBarFont),topFrame);
1022 topLayout->addWidget(timeBarFont->label(),i,0); 1022 topLayout->addWidget(timeBarFont->label(),i,0);
1023 topLayout->addWidget(timeBarFont->preview(),i,1); 1023 topLayout->addWidget(timeBarFont->preview(),i,1);
1024 topLayout->addWidget(timeBarFont->button(),i,2); 1024 topLayout->addWidget(timeBarFont->button(),i,2);
1025 ++i; 1025 ++i;
1026 1026
1027 1027
1028 KPrefsDialogWidFont *marcusBainsFont = 1028 KPrefsDialogWidFont *marcusBainsFont =
1029 addWidFont(KGlobal::locale()->formatTime(QTime(12,34,23)),i18n("M. Bains line:"), 1029 addWidFont(KGlobal::locale()->formatTime(QTime(12,34,23)),i18n("M. Bains line:"),
1030 &(KOPrefs::instance()->mMarcusBainsFont),topFrame); 1030 &(KOPrefs::instance()->mMarcusBainsFont),topFrame);
1031 topLayout->addWidget(marcusBainsFont->label(),i,0); 1031 topLayout->addWidget(marcusBainsFont->label(),i,0);
1032 topLayout->addWidget(marcusBainsFont->preview(),i,1); 1032 topLayout->addWidget(marcusBainsFont->preview(),i,1);
1033 topLayout->addWidget(marcusBainsFont->button(),i,2); 1033 topLayout->addWidget(marcusBainsFont->button(),i,2);
1034 ++i; 1034 ++i;
1035 1035
1036 tVFont = 1036 tVFont =
1037 addWidFont(i18n("Summary"),i18n("Event Viewer:"), 1037 addWidFont(i18n("Summary"),i18n("Event Viewer:"),
1038 &(KOPrefs::instance()->mEventViewFont),topFrame); 1038 &(KOPrefs::instance()->mEventViewFont),topFrame);
1039 topLayout->addWidget(tVFont->label(),i,0); 1039 topLayout->addWidget(tVFont->label(),i,0);
1040 topLayout->addWidget(tVFont->preview(),i,1); 1040 topLayout->addWidget(tVFont->preview(),i,1);
1041 topLayout->addWidget(tVFont->button(),i,2); 1041 topLayout->addWidget(tVFont->button(),i,2);
1042 ++i; 1042 ++i;
1043 1043
1044 1044
1045 1045
1046 tVFont = 1046 tVFont =
1047 addWidFont(i18n("Details"),i18n("EditorBox:"), 1047 addWidFont(i18n("Details"),i18n("EditorBox:"),
1048 &(KOPrefs::instance()->mEditBoxFont),topFrame); 1048 &(KOPrefs::instance()->mEditBoxFont),topFrame);
1049 topLayout->addWidget(tVFont->label(),i,0); 1049 topLayout->addWidget(tVFont->label(),i,0);
1050 topLayout->addWidget(tVFont->preview(),i,1); 1050 topLayout->addWidget(tVFont->preview(),i,1);
1051 topLayout->addWidget(tVFont->button(),i,2); 1051 topLayout->addWidget(tVFont->button(),i,2);
1052 ++i; 1052 ++i;
1053 1053
1054 1054
1055 1055
1056 topLayout->setColStretch(1,1); 1056 topLayout->setColStretch(1,1);
1057 topLayout->setRowStretch(4,1); 1057 topLayout->setRowStretch(4,1);
1058 1058
1059 1059
1060 i = 0; 1060 i = 0;
1061 topFrame = addPage(i18n("View Fonts"),0, 1061 topFrame = addPage(i18n("View Fonts"),0,
1062 DesktopIcon("fonts",KIcon::SizeMedium)); 1062 DesktopIcon("fonts",KIcon::SizeMedium));
1063 1063
1064 topLayout = new QGridLayout(topFrame,7,3); 1064 topLayout = new QGridLayout(topFrame,7,3);
1065 topLayout->setSpacing(1); 1065 topLayout->setSpacing(1);
1066 topLayout->setMargin(3); 1066 topLayout->setMargin(3);
1067 1067
1068 tVFont = 1068 tVFont =
1069 addWidFont(i18n("Configure KO"),i18n("What's Next View:"), 1069 addWidFont(i18n("Configure KO"),i18n("What's Next View:"),
1070 &(KOPrefs::instance()->mWhatsNextFont),topFrame); 1070 &(KOPrefs::instance()->mWhatsNextFont),topFrame);
1071 topLayout->addWidget(tVFont->label(),i,0); 1071 topLayout->addWidget(tVFont->label(),i,0);
1072 topLayout->addWidget(tVFont->preview(),i,1); 1072 topLayout->addWidget(tVFont->preview(),i,1);
1073 topLayout->addWidget(tVFont->button(),i,2); 1073 topLayout->addWidget(tVFont->button(),i,2);
1074 ++i; 1074 ++i;
1075 KPrefsDialogWidFont *agendaViewFont = 1075 KPrefsDialogWidFont *agendaViewFont =
1076 addWidFont(i18n("Event text"),i18n("Agenda view:"), 1076 addWidFont(i18n("Event text"),i18n("Agenda view:"),
1077 &(KOPrefs::instance()->mAgendaViewFont),topFrame); 1077 &(KOPrefs::instance()->mAgendaViewFont),topFrame);
1078 topLayout->addWidget(agendaViewFont->label(),i,0); 1078 topLayout->addWidget(agendaViewFont->label(),i,0);
1079 topLayout->addWidget(agendaViewFont->preview(),i,1); 1079 topLayout->addWidget(agendaViewFont->preview(),i,1);
1080 topLayout->addWidget(agendaViewFont->button(),i,2); 1080 topLayout->addWidget(agendaViewFont->button(),i,2);
1081 ++i; 1081 ++i;
1082 1082
1083 1083
1084 KPrefsDialogWidFont *monthViewFont = 1084 KPrefsDialogWidFont *monthViewFont =
1085 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"), 1085 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"),
1086 i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame); 1086 i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame);
1087 topLayout->addWidget(monthViewFont->label(),i,0); 1087 topLayout->addWidget(monthViewFont->label(),i,0);
1088 topLayout->addWidget(monthViewFont->preview(),i,1); 1088 topLayout->addWidget(monthViewFont->preview(),i,1);
1089 topLayout->addWidget(monthViewFont->button(),i,2); 1089 topLayout->addWidget(monthViewFont->button(),i,2);
1090 ++i; 1090 ++i;
1091 1091
1092 1092
1093 KPrefsDialogWidFont *lVFont = 1093 KPrefsDialogWidFont *lVFont =
1094 addWidFont(i18n("Event"),i18n("List View:"), 1094 addWidFont(i18n("Event"),i18n("List View:"),
1095 &(KOPrefs::instance()->mListViewFont),topFrame); 1095 &(KOPrefs::instance()->mListViewFont),topFrame);
1096 topLayout->addWidget(lVFont->label(),i,0); 1096 topLayout->addWidget(lVFont->label(),i,0);
1097 topLayout->addWidget(lVFont->preview(),i,1); 1097 topLayout->addWidget(lVFont->preview(),i,1);
1098 topLayout->addWidget(lVFont->button(),i,2); 1098 topLayout->addWidget(lVFont->button(),i,2);
1099 ++i; 1099 ++i;
1100 1100
1101 1101
1102 tVFont = 1102 tVFont =
1103 addWidFont(i18n("ToDo"),i18n("ToDoView:"), 1103 addWidFont(i18n("ToDo"),i18n("ToDoView:"),
1104 &(KOPrefs::instance()->mTodoViewFont),topFrame); 1104 &(KOPrefs::instance()->mTodoViewFont),topFrame);
1105 topLayout->addWidget(tVFont->label(),i,0); 1105 topLayout->addWidget(tVFont->label(),i,0);
1106 topLayout->addWidget(tVFont->preview(),i,1); 1106 topLayout->addWidget(tVFont->preview(),i,1);
1107 topLayout->addWidget(tVFont->button(),i,2); 1107 topLayout->addWidget(tVFont->button(),i,2);
1108 ++i; 1108 ++i;
1109 1109
1110 1110
1111 tVFont = 1111 tVFont =
1112 addWidFont(i18n("Today"),i18n("JournalView:"), 1112 addWidFont(i18n("Today"),i18n("JournalView:"),
1113 &(KOPrefs::instance()->mJornalViewFont),topFrame); 1113 &(KOPrefs::instance()->mJornalViewFont),topFrame);
1114 topLayout->addWidget(tVFont->label(),i,0); 1114 topLayout->addWidget(tVFont->label(),i,0);
1115 topLayout->addWidget(tVFont->preview(),i,1); 1115 topLayout->addWidget(tVFont->preview(),i,1);
1116 topLayout->addWidget(tVFont->button(),i,2); 1116 topLayout->addWidget(tVFont->button(),i,2);
1117 ++i; 1117 ++i;
1118 1118
1119 1119
1120 1120
1121 1121
1122 topLayout->setColStretch(1,1); 1122 topLayout->setColStretch(1,1);
1123 topLayout->setRowStretch(4,1); 1123 topLayout->setRowStretch(4,1);
1124 1124
1125 1125
1126 1126
1127 1127
1128} 1128}
1129 1129
1130void KOPrefsDialog::setupColorsTab() 1130void KOPrefsDialog::setupColorsTab()
1131{ 1131{
1132 QFrame *topFrame = addPage(i18n("Colors"),0,0); 1132 QFrame *topFrame = addPage(i18n("Colors"),0,0);
1133 // DesktopIcon("colorize",KIcon::SizeMedium)); 1133 // DesktopIcon("colorize",KIcon::SizeMedium));
1134 1134
1135 QGridLayout *topLayout = new QGridLayout(topFrame,5,2); 1135 QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
1136 // topLayout->setSpacing(spacingHint()); 1136 // topLayout->setSpacing(spacingHint());
1137 // topLayout->setMargin(marginHint()); 1137 // topLayout->setMargin(marginHint());
1138 1138
1139 topLayout->setSpacing(2); 1139 topLayout->setSpacing(2);
1140 topLayout->setMargin(3); 1140 topLayout->setMargin(3);
1141 1141
1142 int ii = 1; 1142 int ii = 1;
1143 QGroupBox *categoryGroup ; 1143 QGroupBox *categoryGroup ;
1144 1144
1145 categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"), 1145 categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"),
1146 topFrame); 1146 topFrame);
1147 topLayout->addMultiCellWidget(categoryGroup,0,0,0,1); 1147 topLayout->addMultiCellWidget(categoryGroup,0,0,0,1);
1148 1148
1149 mCategoryCombo = new QComboBox(categoryGroup); 1149 mCategoryCombo = new QComboBox(categoryGroup);
1150 mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); 1150 mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
1151 connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor())); 1151 connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor()));
1152 1152
1153 mCategoryButton = new KColorButton(categoryGroup); 1153 mCategoryButton = new KColorButton(categoryGroup);
1154 connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor())); 1154 connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor()));
1155 updateCategoryColor(); 1155 updateCategoryColor();
1156 1156
1157 1157
1158 // Holiday Color 1158 // Holiday Color
1159 1159
1160 KPrefsDialogWidColor *holidayColor = 1160 KPrefsDialogWidColor *holidayColor =
1161 addWidColor(i18n("Holiday color:"), 1161 addWidColor(i18n("Holiday color:"),
1162 &(KOPrefs::instance()->mHolidayColor),topFrame); 1162 &(KOPrefs::instance()->mHolidayColor),topFrame);
1163 topLayout->addWidget(holidayColor->label(),ii,0); 1163 topLayout->addWidget(holidayColor->label(),ii,0);
1164 topLayout->addWidget(holidayColor->button(),ii++,1); 1164 topLayout->addWidget(holidayColor->button(),ii++,1);
1165 1165
1166 // Highlight Color 1166 // Highlight Color
1167 KPrefsDialogWidColor *highlightColor = 1167 KPrefsDialogWidColor *highlightColor =
1168 addWidColor(i18n("Highlight color:"), 1168 addWidColor(i18n("Highlight color:"),
1169 &(KOPrefs::instance()->mHighlightColor),topFrame); 1169 &(KOPrefs::instance()->mHighlightColor),topFrame);
1170 topLayout->addWidget(highlightColor->label(),ii,0); 1170 topLayout->addWidget(highlightColor->label(),ii,0);
1171 topLayout->addWidget(highlightColor->button(),ii++,1); 1171 topLayout->addWidget(highlightColor->button(),ii++,1);
1172 1172
1173 // Event color 1173 // Event color
1174 KPrefsDialogWidColor *eventColor = 1174 KPrefsDialogWidColor *eventColor =
1175 addWidColor(i18n("Default event color:"), 1175 addWidColor(i18n("Default event color:"),
1176 &(KOPrefs::instance()->mEventColor),topFrame); 1176 &(KOPrefs::instance()->mEventColor),topFrame);
1177 topLayout->addWidget(eventColor->label(),ii,0); 1177 topLayout->addWidget(eventColor->label(),ii,0);
1178 topLayout->addWidget(eventColor->button(),ii++,1); 1178 topLayout->addWidget(eventColor->button(),ii++,1);
1179 eventColor =
1180 addWidColor(i18n("Default todo done color:"),
1181 &(KOPrefs::instance()->mTodoDoneColor),topFrame);
1182 topLayout->addWidget(eventColor->label(),ii,0);
1183 topLayout->addWidget(eventColor->button(),ii++,1);
1184
1179 1185
1180 // agenda view background color 1186 // agenda view background color
1181 KPrefsDialogWidColor *agendaBgColor = 1187 KPrefsDialogWidColor *agendaBgColor =
1182 addWidColor(i18n("Agenda view background color:"), 1188 addWidColor(i18n("Agenda view background color:"),
1183 &(KOPrefs::instance()->mAgendaBgColor),topFrame); 1189 &(KOPrefs::instance()->mAgendaBgColor),topFrame);
1184 topLayout->addWidget(agendaBgColor->label(),ii,0); 1190 topLayout->addWidget(agendaBgColor->label(),ii,0);
1185 topLayout->addWidget(agendaBgColor->button(),ii++,1); 1191 topLayout->addWidget(agendaBgColor->button(),ii++,1);
1186 1192
1187 // working hours color 1193 // working hours color
1188 KPrefsDialogWidColor *workingHoursColor = 1194 KPrefsDialogWidColor *workingHoursColor =
1189 addWidColor(i18n("Working hours color:"), 1195 addWidColor(i18n("Working hours color:"),
1190 &(KOPrefs::instance()->mWorkingHoursColor),topFrame); 1196 &(KOPrefs::instance()->mWorkingHoursColor),topFrame);
1191 topLayout->addWidget(workingHoursColor->label(),ii,0); 1197 topLayout->addWidget(workingHoursColor->label(),ii,0);
1192 topLayout->addWidget(workingHoursColor->button(),ii++,1); 1198 topLayout->addWidget(workingHoursColor->button(),ii++,1);
1193 1199
1194 KPrefsDialogWidBool *sb = 1200 KPrefsDialogWidBool *sb =
1195 addWidBool(i18n("Use colors for application:"), 1201 addWidBool(i18n("Use colors for application:"),
1196 &(KOPrefs::instance()->mUseAppColors),topFrame); 1202 &(KOPrefs::instance()->mUseAppColors),topFrame);
1197 topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 ); 1203 topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 );
1198 1204
1199 ii++; 1205 ii++;
1200 KPrefsDialogWidColor * workingHoursColor1 = 1206 KPrefsDialogWidColor * workingHoursColor1 =
1201 addWidColor(i18n("Buttons, menus, etc.:"), 1207 addWidColor(i18n("Buttons, menus, etc.:"),
1202 &(KOPrefs::instance()->mAppColor1),topFrame); 1208 &(KOPrefs::instance()->mAppColor1),topFrame);
1203 topLayout->addWidget(workingHoursColor1->label(),ii,0); 1209 topLayout->addWidget(workingHoursColor1->label(),ii,0);
1204 topLayout->addWidget(workingHoursColor1->button(),ii++,1); 1210 topLayout->addWidget(workingHoursColor1->button(),ii++,1);
1205 1211
1206 KPrefsDialogWidColor * workingHoursColor2 = 1212 KPrefsDialogWidColor * workingHoursColor2 =
1207 addWidColor(i18n("Frames, labels, etc.:"), 1213 addWidColor(i18n("Frames, labels, etc.:"),
1208 &(KOPrefs::instance()->mAppColor2),topFrame); 1214 &(KOPrefs::instance()->mAppColor2),topFrame);
1209 topLayout->addWidget(workingHoursColor2->label(),ii,0); 1215 topLayout->addWidget(workingHoursColor2->label(),ii,0);
1210 topLayout->addWidget(workingHoursColor2->button(),ii++,1); 1216 topLayout->addWidget(workingHoursColor2->button(),ii++,1);
1211 1217
1212 1218
1213 1219
1214} 1220}
1215 1221
1216void KOPrefsDialog::setCategoryColor() 1222void KOPrefsDialog::setCategoryColor()
1217{ 1223{
1218 mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color())); 1224 mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color()));
1219} 1225}
1220 1226
1221void KOPrefsDialog::updateCategoryColor() 1227void KOPrefsDialog::updateCategoryColor()
1222{ 1228{
1223 QString cat = mCategoryCombo->currentText(); 1229 QString cat = mCategoryCombo->currentText();
1224 QColor *color = mCategoryDict.find(cat); 1230 QColor *color = mCategoryDict.find(cat);
1225 if (!color) { 1231 if (!color) {
1226 color = KOPrefs::instance()->categoryColor(cat); 1232 color = KOPrefs::instance()->categoryColor(cat);
1227 } 1233 }
1228 if (color) { 1234 if (color) {
1229 mCategoryButton->setColor(*color); 1235 mCategoryButton->setColor(*color);
1230 } 1236 }
1231} 1237}
1232 1238
1233void KOPrefsDialog::setupPrinterTab() 1239void KOPrefsDialog::setupPrinterTab()
1234{ 1240{
1235 mPrinterTab = addPage(i18n("Printing"),0, 1241 mPrinterTab = addPage(i18n("Printing"),0,
1236 DesktopIcon("fileprint",KIcon::SizeMedium)); 1242 DesktopIcon("fileprint",KIcon::SizeMedium));
1237 1243
1238 QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2); 1244 QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
1239 topLayout->setSpacing(spacingHint()); 1245 topLayout->setSpacing(spacingHint());
1240 topLayout->setMargin(marginHint()); 1246 topLayout->setMargin(marginHint());
1241 1247
1242 topLayout->setRowStretch(4,1); 1248 topLayout->setRowStretch(4,1);
1243} 1249}
1244 1250
1245void KOPrefsDialog::setupGroupSchedulingTab() 1251void KOPrefsDialog::setupGroupSchedulingTab()
1246{ 1252{
1247#if 0 1253#if 0
1248 QFrame *topFrame = addPage(i18n("Group Scheduling"),0, 1254 QFrame *topFrame = addPage(i18n("Group Scheduling"),0,
1249 DesktopIcon("personal",KIcon::SizeMedium)); 1255 DesktopIcon("personal",KIcon::SizeMedium));
1250 1256
1251 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 1257 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
1252 topLayout->setSpacing(spacingHint()); 1258 topLayout->setSpacing(spacingHint());
1253 topLayout->setMargin(marginHint()); 1259 topLayout->setMargin(marginHint());
1254 1260
1255#if 0 1261#if 0
1256 KPrefsDialogWidRadios *schedulerGroup = 1262 KPrefsDialogWidRadios *schedulerGroup =
1257 addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler), 1263 addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler),
1258 topFrame); 1264 topFrame);
1259 schedulerGroup->addRadio("Dummy"); // Only for debugging 1265 schedulerGroup->addRadio("Dummy"); // Only for debugging
1260 schedulerGroup->addRadio(i18n("Mail client")); 1266 schedulerGroup->addRadio(i18n("Mail client"));
1261 1267
1262 topLayout->addMultiCellWidget(schedulerGroup->groupBox(),0,0,0,1); 1268 topLayout->addMultiCellWidget(schedulerGroup->groupBox(),0,0,0,1);
1263#endif 1269#endif
1264 1270
1265 KPrefsDialogWidRadios *sendGroup = 1271 KPrefsDialogWidRadios *sendGroup =
1266 addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend), 1272 addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend),
1267 topFrame); 1273 topFrame);
1268 sendGroup->addRadio(i18n("Send to outbox")); 1274 sendGroup->addRadio(i18n("Send to outbox"));
1269 sendGroup->addRadio(i18n("Send directly")); 1275 sendGroup->addRadio(i18n("Send directly"));
1270 1276
1271 topLayout->addMultiCellWidget(sendGroup->groupBox(),1,1,0,1); 1277 topLayout->addMultiCellWidget(sendGroup->groupBox(),1,1,0,1);
1272 1278
1273 topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1); 1279 topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1);
1274 mAMails = new QListView(topFrame); 1280 mAMails = new QListView(topFrame);
1275 mAMails->addColumn(i18n("Email"),300); 1281 mAMails->addColumn(i18n("Email"),300);
1276 topLayout->addMultiCellWidget(mAMails,3,3,0,1); 1282 topLayout->addMultiCellWidget(mAMails,3,3,0,1);
1277 1283
1278 topLayout->addWidget(new QLabel(i18n("Additional email address:"),topFrame),4,0); 1284 topLayout->addWidget(new QLabel(i18n("Additional email address:"),topFrame),4,0);
1279 aEmailsEdit = new QLineEdit(topFrame); 1285 aEmailsEdit = new QLineEdit(topFrame);
1280 aEmailsEdit->setEnabled(false); 1286 aEmailsEdit->setEnabled(false);
1281 topLayout->addWidget(aEmailsEdit,4,1); 1287 topLayout->addWidget(aEmailsEdit,4,1);
1282 1288
1283 QPushButton *add = new QPushButton(i18n("New"),topFrame,"new"); 1289 QPushButton *add = new QPushButton(i18n("New"),topFrame,"new");
1284 topLayout->addWidget(add,5,0); 1290 topLayout->addWidget(add,5,0);
1285 QPushButton *del = new QPushButton(i18n("Remove"),topFrame,"remove"); 1291 QPushButton *del = new QPushButton(i18n("Remove"),topFrame,"remove");
1286 topLayout->addWidget(del,5,1); 1292 topLayout->addWidget(del,5,1);
1287 1293
1288 //topLayout->setRowStretch(2,1); 1294 //topLayout->setRowStretch(2,1);
1289 connect(add, SIGNAL( clicked() ), this, SLOT(addItem()) ); 1295 connect(add, SIGNAL( clicked() ), this, SLOT(addItem()) );
1290 connect(del, SIGNAL( clicked() ), this, SLOT(removeItem()) ); 1296 connect(del, SIGNAL( clicked() ), this, SLOT(removeItem()) );
1291 connect(aEmailsEdit,SIGNAL( textChanged(const QString&) ), this,SLOT(updateItem())); 1297 connect(aEmailsEdit,SIGNAL( textChanged(const QString&) ), this,SLOT(updateItem()));
1292 connect(mAMails,SIGNAL(selectionChanged(QListViewItem *)),SLOT(updateInput())); 1298 connect(mAMails,SIGNAL(selectionChanged(QListViewItem *)),SLOT(updateInput()));
1293#endif 1299#endif
1294} 1300}
1295 1301
1296void KOPrefsDialog::setupGroupAutomationTab() 1302void KOPrefsDialog::setupGroupAutomationTab()
1297{ 1303{
1298 return; 1304 return;
1299 QFrame *topFrame = addPage(i18n("Group Automation"),0, 1305 QFrame *topFrame = addPage(i18n("Group Automation"),0,
1300 DesktopIcon("personal",KIcon::SizeMedium)); 1306 DesktopIcon("personal",KIcon::SizeMedium));
1301 1307
1302 QGridLayout *topLayout = new QGridLayout(topFrame,5,1); 1308 QGridLayout *topLayout = new QGridLayout(topFrame,5,1);
1303 topLayout->setSpacing(spacingHint()); 1309 topLayout->setSpacing(spacingHint());
1304 topLayout->setMargin(marginHint()); 1310 topLayout->setMargin(marginHint());
1305 1311
1306 KPrefsDialogWidRadios *autoRefreshGroup = 1312 KPrefsDialogWidRadios *autoRefreshGroup =
1307 addWidRadios(i18n("Auto Send Refresh"), 1313 addWidRadios(i18n("Auto Send Refresh"),
1308 &(KOPrefs::instance()->mIMIPAutoRefresh),topFrame); 1314 &(KOPrefs::instance()->mIMIPAutoRefresh),topFrame);
1309 autoRefreshGroup->addRadio(i18n("Never")); 1315 autoRefreshGroup->addRadio(i18n("Never"));
1310 autoRefreshGroup->addRadio(i18n("If attendee is in addressbook")); 1316 autoRefreshGroup->addRadio(i18n("If attendee is in addressbook"));
1311 //autoRefreshGroup->addRadio(i18n("selected emails")); 1317 //autoRefreshGroup->addRadio(i18n("selected emails"));
1312 topLayout->addMultiCellWidget(autoRefreshGroup->groupBox(),0,0,0,0); 1318 topLayout->addMultiCellWidget(autoRefreshGroup->groupBox(),0,0,0,0);
1313 1319
1314 KPrefsDialogWidRadios *autoInsertGroup = 1320 KPrefsDialogWidRadios *autoInsertGroup =
1315 addWidRadios(i18n("Auto Insert IMIP Replies"), 1321 addWidRadios(i18n("Auto Insert IMIP Replies"),
1316 &(KOPrefs::instance()->mIMIPAutoInsertReply),topFrame); 1322 &(KOPrefs::instance()->mIMIPAutoInsertReply),topFrame);
1317 autoInsertGroup->addRadio(i18n("Never")); 1323 autoInsertGroup->addRadio(i18n("Never"));
1318 autoInsertGroup->addRadio(i18n("If attendee is in addressbook")); 1324 autoInsertGroup->addRadio(i18n("If attendee is in addressbook"));
1319 //autoInsertGroup->addRadio(i18n("selected emails")); 1325 //autoInsertGroup->addRadio(i18n("selected emails"));
1320 topLayout->addMultiCellWidget(autoInsertGroup->groupBox(),1,1,0,0); 1326 topLayout->addMultiCellWidget(autoInsertGroup->groupBox(),1,1,0,0);
1321 1327
1322 KPrefsDialogWidRadios *autoRequestGroup = 1328 KPrefsDialogWidRadios *autoRequestGroup =
1323 addWidRadios(i18n("Auto Insert IMIP Requests"), 1329 addWidRadios(i18n("Auto Insert IMIP Requests"),
1324 &(KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame); 1330 &(KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame);
1325 autoRequestGroup->addRadio(i18n("Never")); 1331 autoRequestGroup->addRadio(i18n("Never"));
1326 autoRequestGroup->addRadio(i18n("If organizer is in addressbook")); 1332 autoRequestGroup->addRadio(i18n("If organizer is in addressbook"));
1327 //autoInsertGroup->addRadio(i18n("selected emails")); 1333 //autoInsertGroup->addRadio(i18n("selected emails"));
1328 topLayout->addMultiCellWidget(autoRequestGroup->groupBox(),2,2,0,0); 1334 topLayout->addMultiCellWidget(autoRequestGroup->groupBox(),2,2,0,0);
1329 1335
1330 KPrefsDialogWidRadios *autoFreeBusyGroup = 1336 KPrefsDialogWidRadios *autoFreeBusyGroup =
1331 addWidRadios(i18n("Auto Send FreeBusy Information"), 1337 addWidRadios(i18n("Auto Send FreeBusy Information"),
1332 &(KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame); 1338 &(KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame);
1333 autoFreeBusyGroup->addRadio(i18n("Never")); 1339 autoFreeBusyGroup->addRadio(i18n("Never"));
1334 autoFreeBusyGroup->addRadio(i18n("If requested from an email in addressbook")); 1340 autoFreeBusyGroup->addRadio(i18n("If requested from an email in addressbook"));
1335 //autoFreeBusyGroup->addRadio(i18n("selected emails")); 1341 //autoFreeBusyGroup->addRadio(i18n("selected emails"));
1336 topLayout->addMultiCellWidget(autoFreeBusyGroup->groupBox(),3,3,0,0); 1342 topLayout->addMultiCellWidget(autoFreeBusyGroup->groupBox(),3,3,0,0);
1337 1343
1338 KPrefsDialogWidRadios *autoFreeBusyReplyGroup = 1344 KPrefsDialogWidRadios *autoFreeBusyReplyGroup =
1339 addWidRadios(i18n("Auto Save FreeBusy Replies"), 1345 addWidRadios(i18n("Auto Save FreeBusy Replies"),
1340 &(KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame); 1346 &(KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame);
1341 autoFreeBusyReplyGroup->addRadio(i18n("Never")); 1347 autoFreeBusyReplyGroup->addRadio(i18n("Never"));
1342 autoFreeBusyReplyGroup->addRadio(i18n("If attendee is in addressbook")); 1348 autoFreeBusyReplyGroup->addRadio(i18n("If attendee is in addressbook"));
1343 //autoFreeBusyGroup->addRadio(i18n("selected emails")); 1349 //autoFreeBusyGroup->addRadio(i18n("selected emails"));
1344 topLayout->addMultiCellWidget(autoFreeBusyReplyGroup->groupBox(),4,4,0,0); 1350 topLayout->addMultiCellWidget(autoFreeBusyReplyGroup->groupBox(),4,4,0,0);
1345} 1351}
1346 1352
1347void KOPrefsDialog::showPrinterTab() 1353void KOPrefsDialog::showPrinterTab()
1348{ 1354{
1349 showPage(pageIndex(mPrinterTab)); 1355 showPage(pageIndex(mPrinterTab));
1350} 1356}
1351 1357
1352 1358
1353void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text, 1359void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text,
1354 const QStringList *tags) 1360 const QStringList *tags)
1355{ 1361{
1356 if (tags) { 1362 if (tags) {
1357 int i = tags->findIndex(text); 1363 int i = tags->findIndex(text);
1358 if (i > 0) combo->setCurrentItem(i); 1364 if (i > 0) combo->setCurrentItem(i);
1359 } else { 1365 } else {
1360 for(int i=0;i<combo->count();++i) { 1366 for(int i=0;i<combo->count();++i) {
1361 if (combo->text(i) == text) { 1367 if (combo->text(i) == text) {
1362 combo->setCurrentItem(i); 1368 combo->setCurrentItem(i);
1363 break; 1369 break;
1364 } 1370 }
1365 } 1371 }
1366 } 1372 }
1367} 1373}
1368 1374
1369void KOPrefsDialog::usrReadConfig() 1375void KOPrefsDialog::usrReadConfig()
1370{ 1376{
1371 kdelibcfg->readConfig(); 1377 kdelibcfg->readConfig();
1372 mNameEdit->setText(KOPrefs::instance()->fullName()); 1378 mNameEdit->setText(KOPrefs::instance()->fullName());
1373 mEmailEdit->setText(KOPrefs::instance()->email()); 1379 mEmailEdit->setText(KOPrefs::instance()->email());
1374 1380
1375 mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval); 1381 mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval);
1376 // QDate current ( 2001, 1,1); 1382 // QDate current ( 2001, 1,1);
1377 //mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); 1383 //mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
1378 //mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); 1384 //mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1));
1379 //setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId)); 1385 //setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId));
1380 //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); 1386 //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset);
1381 mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime); 1387 mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime);
1382 mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration); 1388 mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration);
1383 mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime); 1389 mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime);
1384 // if (KOPrefs::instance()->mAllDaySize > 47 ) 1390 // if (KOPrefs::instance()->mAllDaySize > 47 )
1385 // KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize/2; 1391 // KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize/2;
1386 //mHourSizeSlider->setValue(KOPrefs::instance()->mAllDaySize); 1392 //mHourSizeSlider->setValue(KOPrefs::instance()->mAllDaySize);
1387 1393
1388 mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays); 1394 mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays);
1389 mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays); 1395 mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays);
1390 mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios); 1396 mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios);
1391 // mAMails->clear(); 1397 // mAMails->clear();
1392 // for ( QStringList::Iterator it = KOPrefs::instance()->mAdditionalMails.begin(); 1398 // for ( QStringList::Iterator it = KOPrefs::instance()->mAdditionalMails.begin();
1393// it != KOPrefs::instance()->mAdditionalMails.end(); ++it ) { 1399// it != KOPrefs::instance()->mAdditionalMails.end(); ++it ) {
1394// QListViewItem *item = new QListViewItem(mAMails); 1400// QListViewItem *item = new QListViewItem(mAMails);
1395// item->setText(0,*it); 1401// item->setText(0,*it);
1396// mAMails->insertItem(item); 1402// mAMails->insertItem(item);
1397// } 1403// }
1398 1404
1399 // mRemoteIPEdit->setText(KOPrefs::instance()->mRemoteIP); 1405 // mRemoteIPEdit->setText(KOPrefs::instance()->mRemoteIP);
1400 //mRemoteUser->setText(KOPrefs::instance()->mRemoteUser); 1406 //mRemoteUser->setText(KOPrefs::instance()->mRemoteUser);
1401 //mRemotePassWd->setText(KOPrefs::instance()->mRemotePassWd); 1407 //mRemotePassWd->setText(KOPrefs::instance()->mRemotePassWd);
1402 //mRemoteFile->setText(KOPrefs::instance()->mRemoteFile); 1408 //mRemoteFile->setText(KOPrefs::instance()->mRemoteFile);
1403 1409
1404 //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile); 1410 //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile);
1405 mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile); 1411 mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile);
1406 //QString dummy = KOPrefs::instance()->mUserDateFormatLong; 1412 //QString dummy = KOPrefs::instance()->mUserDateFormatLong;
1407 //mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); 1413 //mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") ));
1408 //dummy = KOPrefs::instance()->mUserDateFormatShort; 1414 //dummy = KOPrefs::instance()->mUserDateFormatShort;
1409 //mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); 1415 //mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") ));
1410 updateCategories(); 1416 updateCategories();
1411 mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps ); 1417 mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps );
1412 mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime ); 1418 mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime );
1413 mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount ); 1419 mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount );
1414 mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval ); 1420 mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval );
1415} 1421}
1416 1422
1417 1423
1418void KOPrefsDialog::usrWriteConfig() 1424void KOPrefsDialog::usrWriteConfig()
1419{ 1425{
1420 1426
1421 kdelibcfg->writeConfig(); 1427 kdelibcfg->writeConfig();
1422 // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text(); 1428 // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text();
1423 //KOPrefs::instance()->mRemoteUser = mRemoteUser->text(); 1429 //KOPrefs::instance()->mRemoteUser = mRemoteUser->text();
1424 //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text(); 1430 //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text();
1425 //KOPrefs::instance()->mRemoteFile= mRemoteFile->text(); 1431 //KOPrefs::instance()->mRemoteFile= mRemoteFile->text();
1426 //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text(); 1432 //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text();
1427 KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text(); 1433 KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text();
1428 1434
1429 //KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); 1435 //KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") );
1430 //KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); 1436 //KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") );
1431 KOPrefs::instance()->setFullName(mNameEdit->text()); 1437 KOPrefs::instance()->setFullName(mNameEdit->text());
1432 KOPrefs::instance()->setEmail(mEmailEdit->text()); 1438 KOPrefs::instance()->setEmail(mEmailEdit->text());
1433 1439
1434 KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value(); 1440 KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value();
1435 1441
1436 // KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText(); 1442 // KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText();
1437 //QDate date; 1443 //QDate date;
1438 //date = mStartDateSavingEdit->date(); 1444 //date = mStartDateSavingEdit->date();
1439 //int sub = 0; 1445 //int sub = 0;
1440 //if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) 1446 //if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 )
1441 // sub = 1; 1447 // sub = 1;
1442// KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub; 1448// KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub;
1443// date = mEndDateSavingEdit->date(); 1449// date = mEndDateSavingEdit->date();
1444// if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) 1450// if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 )
1445// sub = 1; 1451// sub = 1;
1446// else 1452// else
1447// sub = 0; 1453// sub = 0;
1448// KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub; 1454// KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub;
1449// // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value(); 1455// // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value();
1450 1456
1451 KOPrefs::instance()->mStartTime = mStartTimeSpin->value(); 1457 KOPrefs::instance()->mStartTime = mStartTimeSpin->value();
1452 KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value(); 1458 KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value();
1453 KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem(); 1459 KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem();
1454 1460
1455 //KOPrefs::instance()->mAllDaySize = mHourSizeSlider->value(); 1461 //KOPrefs::instance()->mAllDaySize = mHourSizeSlider->value();
1456 1462
1457 QDictIterator<QColor> it(mCategoryDict); 1463 QDictIterator<QColor> it(mCategoryDict);
1458 while (it.current()) { 1464 while (it.current()) {
1459 KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current()); 1465 KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current());
1460 ++it; 1466 ++it;
1461 } 1467 }
1462 1468
1463 KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value(); 1469 KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value();
1464 KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value(); 1470 KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value();
1465 KOPrefs::instance()->mWhatsNextPrios = mPrioSpin->value(); 1471 KOPrefs::instance()->mWhatsNextPrios = mPrioSpin->value();
1466 1472
1467 KOPrefs::instance()->mAdditionalMails.clear(); 1473 KOPrefs::instance()->mAdditionalMails.clear();
1468 // QListViewItem *item; 1474 // QListViewItem *item;
1469 // item = mAMails->firstChild(); 1475 // item = mAMails->firstChild();
1470 // while (item) 1476 // while (item)
1471 // { 1477 // {
1472 // KOPrefs::instance()->mAdditionalMails.append( item->text(0) ); 1478 // KOPrefs::instance()->mAdditionalMails.append( item->text(0) );
1473 // item = item->nextSibling(); 1479 // item = item->nextSibling();
1474 // } 1480 // }
1475 KOPrefs::instance()->mAlarmPlayBeeps = mAlarmPlayBeeps->value(); 1481 KOPrefs::instance()->mAlarmPlayBeeps = mAlarmPlayBeeps->value();
1476 KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ; 1482 KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ;
1477 KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ; 1483 KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ;
1478 KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ; 1484 KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ;
1479 1485
1480} 1486}
1481 1487
1482void KOPrefsDialog::updateCategories() 1488void KOPrefsDialog::updateCategories()
1483{ 1489{
1484 mCategoryCombo->clear(); 1490 mCategoryCombo->clear();
1485 mCategoryDict.clear(); 1491 mCategoryDict.clear();
1486 mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); 1492 mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
1487 updateCategoryColor(); 1493 updateCategoryColor();
1488} 1494}
1489 1495
1490void KOPrefsDialog::warningGroupScheduling() 1496void KOPrefsDialog::warningGroupScheduling()
1491{ 1497{
1492 warningExperimental(mEnableGroupScheduling->checkBox()->isChecked()); 1498 warningExperimental(mEnableGroupScheduling->checkBox()->isChecked());
1493} 1499}
1494 1500
1495void KOPrefsDialog::warningProjectView() 1501void KOPrefsDialog::warningProjectView()
1496{ 1502{
1497 warningExperimental(mEnableProjectView->checkBox()->isChecked()); 1503 warningExperimental(mEnableProjectView->checkBox()->isChecked());
1498} 1504}
1499 1505
1500void KOPrefsDialog::warningExperimental(bool on) 1506void KOPrefsDialog::warningExperimental(bool on)
1501{ 1507{
1502 if (on) { 1508 if (on) {
1503 KMessageBox::information(this,i18n("This is an experimental feature. " 1509 KMessageBox::information(this,i18n("This is an experimental feature. "
1504 "It may not work, it may do nothing useful and it may cause data loss. " 1510 "It may not work, it may do nothing useful and it may cause data loss. "
1505 "Use with care.\n" 1511 "Use with care.\n"
1506 "You have to restart KOrganizer for this setting to take effect.")); 1512 "You have to restart KOrganizer for this setting to take effect."));
1507 } else { 1513 } else {
1508 KMessageBox::information(this, 1514 KMessageBox::information(this,
1509 i18n("You have to restart KOrganizer for this setting to take effect.")); 1515 i18n("You have to restart KOrganizer for this setting to take effect."));
1510 } 1516 }
1511} 1517}
1512 1518
1513void KOPrefsDialog::toggleEmailSettings(bool on) 1519void KOPrefsDialog::toggleEmailSettings(bool on)
1514{ 1520{
1515 if (on) { 1521 if (on) {
1516 mEmailEdit->setEnabled(false); 1522 mEmailEdit->setEnabled(false);
1517 mNameEdit->setEnabled(false); 1523 mNameEdit->setEnabled(false);
1518 mEmailLabel->setEnabled(false); 1524 mEmailLabel->setEnabled(false);
1519 mNameLabel->setEnabled(false); 1525 mNameLabel->setEnabled(false);
1520 1526
1521 KEMailSettings settings; 1527 KEMailSettings settings;
1522 mNameEdit->setText(settings.getSetting(KEMailSettings::RealName)); 1528 mNameEdit->setText(settings.getSetting(KEMailSettings::RealName));
1523 mEmailEdit->setText(settings.getSetting(KEMailSettings::EmailAddress)); 1529 mEmailEdit->setText(settings.getSetting(KEMailSettings::EmailAddress));
1524 } else { 1530 } else {
1525 mEmailEdit->setEnabled(true); 1531 mEmailEdit->setEnabled(true);
1526 mNameEdit->setEnabled(true); 1532 mNameEdit->setEnabled(true);
1527 mEmailLabel->setEnabled(true); 1533 mEmailLabel->setEnabled(true);
1528 mNameLabel->setEnabled(true); 1534 mNameLabel->setEnabled(true);
1529 } 1535 }
1530} 1536}
1531 1537
1532void KOPrefsDialog::addItem() 1538void KOPrefsDialog::addItem()
1533{ 1539{
1534 // aEmailsEdit->setEnabled(true); 1540 // aEmailsEdit->setEnabled(true);
1535// QListViewItem *item = new QListViewItem(mAMails); 1541// QListViewItem *item = new QListViewItem(mAMails);
1536// mAMails->insertItem(item); 1542// mAMails->insertItem(item);
1537// mAMails->setSelected(item,true); 1543// mAMails->setSelected(item,true);
1538// aEmailsEdit->setText(i18n("(EmptyEmail)")); 1544// aEmailsEdit->setText(i18n("(EmptyEmail)"));
1539} 1545}
1540 1546
1541void KOPrefsDialog::removeItem() 1547void KOPrefsDialog::removeItem()
1542{ 1548{
1543// QListViewItem *item; 1549// QListViewItem *item;
1544// item = mAMails->selectedItem(); 1550// item = mAMails->selectedItem();
1545// if (!item) return; 1551// if (!item) return;
1546// mAMails->takeItem(item); 1552// mAMails->takeItem(item);
1547// item = mAMails->selectedItem(); 1553// item = mAMails->selectedItem();
1548// if (!item) { 1554// if (!item) {
1549// aEmailsEdit->setText(""); 1555// aEmailsEdit->setText("");
1550// aEmailsEdit->setEnabled(false); 1556// aEmailsEdit->setEnabled(false);
1551// } 1557// }
1552// if (mAMails->childCount() == 0) { 1558// if (mAMails->childCount() == 0) {
1553// aEmailsEdit->setEnabled(false); 1559// aEmailsEdit->setEnabled(false);
1554// } 1560// }
1555} 1561}
1556 1562
1557void KOPrefsDialog::updateItem() 1563void KOPrefsDialog::updateItem()
1558{ 1564{
1559 // QListViewItem *item; 1565 // QListViewItem *item;
1560// item = mAMails->selectedItem(); 1566// item = mAMails->selectedItem();
1561// if (!item) return; 1567// if (!item) return;
1562// item->setText(0,aEmailsEdit->text()); 1568// item->setText(0,aEmailsEdit->text());
1563} 1569}
1564 1570
1565void KOPrefsDialog::updateInput() 1571void KOPrefsDialog::updateInput()
1566{ 1572{
1567// QListViewItem *item; 1573// QListViewItem *item;
1568// item = mAMails->selectedItem(); 1574// item = mAMails->selectedItem();
1569// if (!item) return; 1575// if (!item) return;
1570// aEmailsEdit->setEnabled(true); 1576// aEmailsEdit->setEnabled(true);
1571// aEmailsEdit->setText(item->text(0)); 1577// aEmailsEdit->setText(item->text(0));
1572} 1578}
1573void KOPrefsDialog::updateTimezoneOffset( int index ) 1579void KOPrefsDialog::updateTimezoneOffset( int index )
1574{ 1580{
1575 /* 1581 /*
1576 qDebug("updateTimezoneOffset %d ", index); 1582 qDebug("updateTimezoneOffset %d ", index);
1577 if ( index < 24 ) { 1583 if ( index < 24 ) {
1578 mTimezoneOffsetSpin->setEnabled ( false ); 1584 mTimezoneOffsetSpin->setEnabled ( false );
1579 mTimezoneOffsetSpin->setValue( ( index-11 ) * 60 ); 1585 mTimezoneOffsetSpin->setValue( ( index-11 ) * 60 );
1580 1586
1581 1587
1582 } else { 1588 } else {
1583 if ( index == 24 ) { 1589 if ( index == 24 ) {
1584 mTimezoneOffsetSpin->setEnabled ( true ); 1590 mTimezoneOffsetSpin->setEnabled ( true );
1585 mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); 1591 mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset);
1586 1592
1587 } else { 1593 } else {
1588 mTimezoneOffsetSpin->setEnabled ( false ); 1594 mTimezoneOffsetSpin->setEnabled ( false );
1589 mTimezoneOffsetSpin->setValue( 0 ); 1595 mTimezoneOffsetSpin->setValue( 0 );
1590 } 1596 }
1591 } 1597 }
1592 */ 1598 */
1593} 1599}
1594 1600
1595void KOPrefsDialog::setupTimeZoneTab() 1601void KOPrefsDialog::setupTimeZoneTab()
1596{ 1602{
1597#if 0 1603#if 0
1598 QFrame *topFrame = addPage(i18n("Time Zone"),0,0); 1604 QFrame *topFrame = addPage(i18n("Time Zone"),0,0);
1599 // DesktopIcon("clock",KIcon::SizeMedium)); 1605 // DesktopIcon("clock",KIcon::SizeMedium));
1600 1606
1601 QGridLayout *topLayout = new QGridLayout(topFrame,5,2); 1607 QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
1602 topLayout->setSpacing(spacingHint()); 1608 topLayout->setSpacing(spacingHint());
1603 topLayout->setMargin(marginHint()); 1609 topLayout->setMargin(marginHint());
1604 1610
1605 QHBox *timeZoneBox = new QHBox( topFrame ); 1611 QHBox *timeZoneBox = new QHBox( topFrame );
1606 topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); 1612 topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
1607 1613
1608 new QLabel( i18n("Timezone:"), timeZoneBox ); 1614 new QLabel( i18n("Timezone:"), timeZoneBox );
1609 mTimeZoneCombo = new QComboBox( timeZoneBox ); 1615 mTimeZoneCombo = new QComboBox( timeZoneBox );
1610 if ( QApplication::desktop()->width() < 300 ) { 1616 if ( QApplication::desktop()->width() < 300 ) {
1611 mTimeZoneCombo->setMaximumWidth(150); 1617 mTimeZoneCombo->setMaximumWidth(150);
1612 } 1618 }
1613 1619
1614 QStringList list; 1620 QStringList list;
1615 list = KGlobal::locale()->timeZoneList(); 1621 list = KGlobal::locale()->timeZoneList();
1616 mTimeZoneCombo->insertStringList(list); 1622 mTimeZoneCombo->insertStringList(list);
1617 1623
1618 // find the currently set time zone and select it 1624 // find the currently set time zone and select it
1619 QString sCurrentlySet = KOPrefs::instance()->mTimeZoneId; 1625 QString sCurrentlySet = KOPrefs::instance()->mTimeZoneId;
1620 int nCurrentlySet = 11; 1626 int nCurrentlySet = 11;
1621 for (int i = 0; i < mTimeZoneCombo->count(); i++) 1627 for (int i = 0; i < mTimeZoneCombo->count(); i++)
1622 { 1628 {
1623 if (mTimeZoneCombo->text(i) == sCurrentlySet) 1629 if (mTimeZoneCombo->text(i) == sCurrentlySet)
1624 { 1630 {
1625 nCurrentlySet = i; 1631 nCurrentlySet = i;
1626 break; 1632 break;
1627 } 1633 }
1628 } 1634 }
1629 mTimeZoneCombo->setCurrentItem(nCurrentlySet); 1635 mTimeZoneCombo->setCurrentItem(nCurrentlySet);
1630 int iii = 1; 1636 int iii = 1;
1631 KPrefsDialogWidBool *sb = 1637 KPrefsDialogWidBool *sb =
1632 addWidBool(i18n("Timezone has daylight saving"), 1638 addWidBool(i18n("Timezone has daylight saving"),
1633 &(KOPrefs::instance()->mUseDaylightsaving),topFrame); 1639 &(KOPrefs::instance()->mUseDaylightsaving),topFrame);
1634 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 1640 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
1635 ++iii; 1641 ++iii;
1636 QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); 1642 QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame );
1637 topLayout->addMultiCellWidget(lab, iii,iii,0,1); 1643 topLayout->addMultiCellWidget(lab, iii,iii,0,1);
1638 ++iii; 1644 ++iii;
1639 lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); 1645 lab = new QLabel( i18n("The year in the date is ignored."), topFrame );
1640 topLayout->addMultiCellWidget(lab, iii,iii,0,1); 1646 topLayout->addMultiCellWidget(lab, iii,iii,0,1);
1641 ++iii; 1647 ++iii;
1642 lab = new QLabel( i18n("Daylight start:"), topFrame ); 1648 lab = new QLabel( i18n("Daylight start:"), topFrame );
1643 topLayout->addWidget(lab, iii,0); 1649 topLayout->addWidget(lab, iii,0);
1644 mStartDateSavingEdit = new KDateEdit(topFrame); 1650 mStartDateSavingEdit = new KDateEdit(topFrame);
1645 topLayout->addWidget(mStartDateSavingEdit, iii,1); 1651 topLayout->addWidget(mStartDateSavingEdit, iii,1);
1646 ++iii; 1652 ++iii;
1647 1653
1648 lab = new QLabel( i18n("Daylight end:"), topFrame ); 1654 lab = new QLabel( i18n("Daylight end:"), topFrame );
1649 topLayout->addWidget(lab, iii,0); 1655 topLayout->addWidget(lab, iii,0);
1650 mEndDateSavingEdit = new KDateEdit(topFrame); 1656 mEndDateSavingEdit = new KDateEdit(topFrame);
1651 topLayout->addWidget(mEndDateSavingEdit, iii,1); 1657 topLayout->addWidget(mEndDateSavingEdit, iii,1);
1652 ++iii; 1658 ++iii;
1653 QDate current ( 2001, 1,1); 1659 QDate current ( 2001, 1,1);
1654 mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); 1660 mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
1655 mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); 1661 mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1));
1656#endif 1662#endif
1657 1663
1658} 1664}
1659 1665