summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-01 18:10:09 (UTC)
committer zautrix <zautrix>2005-04-01 18:10:09 (UTC)
commitedc032c21ae3788d02a632ea8066e4ac5a4feedb (patch) (unidiff)
tree8e59c8dcf1cc3021694025627d36e152f7adc389
parent5d88f92b76a760f100384ea5fa6ed143088d19bb (diff)
downloadkdepimpi-edc032c21ae3788d02a632ea8066e4ac5a4feedb.zip
kdepimpi-edc032c21ae3788d02a632ea8066e4ac5a4feedb.tar.gz
kdepimpi-edc032c21ae3788d02a632ea8066e4ac5a4feedb.tar.bz2
fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp28
-rw-r--r--korganizer/kodaymatrix.cpp8
-rw-r--r--korganizer/koeditordetails.cpp5
-rw-r--r--korganizer/koprefs.cpp25
-rw-r--r--korganizer/koprefsdialog.cpp98
-rw-r--r--korganizer/koprefsdialog.h2
-rw-r--r--korganizer/navigatorbar.cpp2
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp2
-rw-r--r--microkde/KDGanttMinimizeSplitter.cpp14
-rw-r--r--microkde/kdialogbase.cpp2
10 files changed, 105 insertions, 81 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 218396d..072d464 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -57,191 +57,192 @@
57#include "koglobals.h" 57#include "koglobals.h"
58#ifndef KORG_NOPLUGINS 58#ifndef KORG_NOPLUGINS
59#include "kocore.h" 59#include "kocore.h"
60#endif 60#endif
61#include "koprefs.h" 61#include "koprefs.h"
62#include "koagenda.h" 62#include "koagenda.h"
63#include "koagendaitem.h" 63#include "koagendaitem.h"
64#ifndef KORG_NOPRINTER 64#ifndef KORG_NOPRINTER
65#include "calprinter.h" 65#include "calprinter.h"
66#endif 66#endif
67 67
68#include "koagendaview.h" 68#include "koagendaview.h"
69//#include "koagendaview.moc" 69//#include "koagendaview.moc"
70 70
71//extern bool globalFlagBlockPainting; 71//extern bool globalFlagBlockPainting;
72extern int globalFlagBlockAgenda; 72extern int globalFlagBlockAgenda;
73extern int globalFlagBlockStartup; 73extern int globalFlagBlockStartup;
74extern int globalFlagBlockAgendaItemPaint; 74extern int globalFlagBlockAgendaItemPaint;
75extern int globalFlagBlockAgendaItemUpdate; 75extern int globalFlagBlockAgendaItemUpdate;
76extern int globalFlagBlockLabel; 76extern int globalFlagBlockLabel;
77using namespace KOrg; 77using namespace KOrg;
78 78
79 79
80 80
81TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) : 81TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) :
82 QScrollView(parent,name,f) 82 QScrollView(parent,name,f)
83{ 83{
84 myPix.resize( 1, 1 ); 84 myPix.resize( 1, 1 );
85 mRows = rows; 85 mRows = rows;
86 86
87 mRedrawNeeded = true; 87 mRedrawNeeded = true;
88 setMinimumHeight( 20 ); 88 setMinimumHeight( 20 );
89 mCellHeight = KOPrefs::instance()->mHourSize*4; 89 mCellHeight = KOPrefs::instance()->mHourSize*4;
90 90
91 enableClipper(true); 91 enableClipper(true);
92 92
93 setHScrollBarMode(AlwaysOff); 93 setHScrollBarMode(AlwaysOff);
94 setVScrollBarMode(AlwaysOff); 94 setVScrollBarMode(AlwaysOff);
95 95
96 resizeContents(50,mRows * mCellHeight); 96 resizeContents(50,mRows * mCellHeight);
97 97
98 viewport()->setBackgroundMode( PaletteBackground ); 98 viewport()->setBackgroundMode( PaletteBackground );
99} 99}
100 100
101void TimeLabels::setCellHeight(int height) 101void TimeLabels::setCellHeight(int height)
102{ 102{
103 mCellHeight = height; 103 mCellHeight = height;
104} 104}
105 105
106/* 106/*
107 Optimization so that only the "dirty" portion of the scroll view 107 Optimization so that only the "dirty" portion of the scroll view
108 is redrawn. Unfortunately, this is not called by default paintEvent() method. 108 is redrawn. Unfortunately, this is not called by default paintEvent() method.
109*/ 109*/
110void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) 110void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
111{ 111{
112 112
113 // if ( globalFlagBlockAgenda ) 113 // if ( globalFlagBlockAgenda )
114 // return; 114 // return;
115 // bug: the parameters cx, cy, cw, ch are the areas that need to be 115 // bug: the parameters cx, cy, cw, ch are the areas that need to be
116 // redrawn, not the area of the widget. unfortunately, this 116 // redrawn, not the area of the widget. unfortunately, this
117 // code assumes the latter... 117 // code assumes the latter...
118 118
119 // now, for a workaround... 119 // now, for a workaround...
120 // these two assignments fix the weird redraw bug 120 // these two assignments fix the weird redraw bug
121 mRedrawNeeded = true;
121 if ( mRedrawNeeded ) { 122 if ( mRedrawNeeded ) {
122 cx = contentsX() + 2; 123 cx = contentsX() + frameWidth()*2;
123 cw = contentsWidth() - 2; 124 cw = contentsWidth() ;
124 // end of workaround 125 // end of workaround
125 126
126 int cell = ((int)(cy/mCellHeight)); 127 int cell = ((int)(cy/mCellHeight));
127 int y = cell * mCellHeight; 128 int y = cell * mCellHeight;
128 QFontMetrics fm = fontMetrics(); 129 QFontMetrics fm = fontMetrics();
129 QString hour; 130 QString hour;
130 QString suffix; 131 QString suffix;
131 int tW = fm.width("24:00i"); 132 int tW = fm.width("24:00i");
132 int timeHeight = fm.height(); 133 int timeHeight = fm.height();
133 //timeHeight -= (timeHeight/4-2); 134 //timeHeight -= (timeHeight/4-2);
134 int borderWidth = 0; 135 int borderWidth = 0;
135 QFont nFont = p->font(); 136 QFont nFont = p->font();
136 137
137 if (!KGlobal::locale()->use12Clock()) 138 if (!KGlobal::locale()->use12Clock())
138 suffix = "00"; 139 suffix = "00";
139 else 140 else
140 borderWidth = 0; 141 borderWidth = 0;
141 if ( timeHeight > mCellHeight ) { 142 if ( timeHeight > mCellHeight ) {
142 timeHeight = mCellHeight-1; 143 timeHeight = mCellHeight-1;
143 int pointS = nFont.pointSize(); 144 int pointS = nFont.pointSize();
144 while ( pointS > 4 ) { 145 while ( pointS > 4 ) {
145 nFont.setPointSize( pointS ); 146 nFont.setPointSize( pointS );
146 fm = QFontMetrics( nFont ); 147 fm = QFontMetrics( nFont );
147 if ( fm.height() < mCellHeight ) 148 if ( fm.height() < mCellHeight )
148 break; 149 break;
149 -- pointS; 150 -- pointS;
150 } 151 }
151 fm = QFontMetrics( nFont ); 152 fm = QFontMetrics( nFont );
152 borderWidth = 4; 153 borderWidth = 4;
153 timeHeight = fm.height(); 154 timeHeight = fm.height();
154 } 155 }
155 timeHeight -= (timeHeight/4-2); 156 //timeHeight -= (timeHeight/4-2);
156 QFont sFont = nFont; 157 QFont sFont = nFont;
157 sFont.setPointSize( sFont.pointSize()/2+2 ); 158 sFont.setPointSize( sFont.pointSize()/2+2 );
158 QFontMetrics fmS( sFont ); 159 QFontMetrics fmS( sFont );
159 int sHei = fmS.height(); 160 int sHei = fmS.height();
160 sHei -= (sHei/4-2); 161 //sHei -= (sHei/4-2);
161 int startW = this->width() - frameWidth(); 162 int startW = this->width() - frameWidth()-1;
162 while (y < cy + ch) { 163 while (y < cy + ch) {
163 p->drawLine(cx,y,cx+tW,y); 164 p->drawLine(cx,y,cx+tW,y);
164 hour.setNum(cell); 165 hour.setNum(cell);
165 166
166 // handle 24h and am/pm time formats 167 // handle 24h and am/pm time formats
167 if (KGlobal::locale()->use12Clock()) { 168 if (KGlobal::locale()->use12Clock()) {
168 if (cell > 11) suffix = "pm"; 169 if (cell > 11) suffix = "pm";
169 else 170 else
170 suffix = "am"; 171 suffix = "am";
171 if (cell == 0) hour.setNum(12); 172 if (cell == 0) hour.setNum(12);
172 if (cell > 12) hour.setNum(cell - 12); 173 if (cell > 12) hour.setNum(cell - 12);
173 } 174 }
174 175
175 // center and draw the time label 176 // center and draw the time label
176 int timeWidth = fm.width(hour+"i"); 177 int timeWidth = fm.width(hour);
177 int tw2 = fm.width(suffix); 178 int tw2 = fm.width(suffix);
178 int offset = startW - timeWidth - tw2 ; 179 int offset = startW - timeWidth - tw2 ;
179 p->setFont( nFont ); 180 p->setFont( nFont );
180 p->drawText(cx - borderWidth + offset, y+ timeHeight, hour); 181 p->drawText( offset, y+ timeHeight, hour);
181 p->setFont( sFont ); 182 p->setFont( sFont );
182 offset = startW - tw2-1; 183 offset = startW - tw2+1;
183 p->drawText(cx - borderWidth + offset, y+ sHei, suffix); 184 p->drawText( offset, y+ sHei, suffix);
184 185
185 // increment indices 186 // increment indices
186 y += mCellHeight; 187 y += mCellHeight;
187 cell++; 188 cell++;
188 } 189 }
189 } else { 190 } else {
190 //qDebug("NO redraw "); 191 //qDebug("NO redraw ");
191 } 192 }
192 // double buffer not yet implemented 193 // double buffer not yet implemented
193 //bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP); 194 //bitBlt (this, 0, 0, &myPix, 0 ,0,width(), height() ,CopyROP);
194 //mRedrawNeeded = false; 195 //mRedrawNeeded = false;
195} 196}
196 197
197/** 198/**
198 Calculates the minimum width. 199 Calculates the minimum width.
199*/ 200*/
200int TimeLabels::minimumWidth() const 201int TimeLabels::minimumWidth() const
201{ 202{
202 return mMiniWidth; 203 return mMiniWidth;
203} 204}
204 205
205/** updates widget's internal state */ 206/** updates widget's internal state */
206void TimeLabels::updateConfig() 207void TimeLabels::updateConfig()
207{ 208{
208 mRedrawNeeded = true; 209 mRedrawNeeded = true;
209 // set the font 210 // set the font
210 // config->setGroup("Fonts"); 211 // config->setGroup("Fonts");
211 // QFont font = config->readFontEntry("TimeBar Font"); 212 // QFont font = config->readFontEntry("TimeBar Font");
212 setFont(KOPrefs::instance()->mTimeBarFont); 213 setFont(KOPrefs::instance()->mTimeBarFont);
213 QString test = "88:88"; 214 QString test = "88:88";
214 if (KGlobal::locale()->use12Clock()) 215 if (KGlobal::locale()->use12Clock())
215 test += "i"; 216 test += "i";
216 mMiniWidth = fontMetrics().width(test) + frameWidth()*2 +1 ; 217 mMiniWidth = fontMetrics().width(test) + frameWidth()*2 +1 ;
217 // update geometry restrictions based on new settings 218 // update geometry restrictions based on new settings
218 setFixedWidth(minimumWidth()); 219 setFixedWidth(minimumWidth());
219 220
220 // update HourSize 221 // update HourSize
221 mCellHeight = KOPrefs::instance()->mHourSize*4; 222 mCellHeight = KOPrefs::instance()->mHourSize*4;
222 resizeContents(50,mRows * mCellHeight); 223 resizeContents(50,mRows * mCellHeight);
223} 224}
224 225
225/** update time label positions */ 226/** update time label positions */
226void TimeLabels::positionChanged() 227void TimeLabels::positionChanged()
227{ 228{
228 int adjustment = mAgenda->contentsY(); 229 int adjustment = mAgenda->contentsY();
229 setContentsPos(0, adjustment); 230 setContentsPos(0, adjustment);
230} 231}
231 232
232/** */ 233/** */
233void TimeLabels::setAgenda(KOAgenda* agenda) 234void TimeLabels::setAgenda(KOAgenda* agenda)
234{ 235{
235 mAgenda = agenda; 236 mAgenda = agenda;
236} 237}
237 238
238void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) 239void TimeLabels::contentsMousePressEvent ( QMouseEvent * e)
239{ 240{
240 mMouseDownY = e->pos().y(); 241 mMouseDownY = e->pos().y();
241 mOrgCap = topLevelWidget()->caption(); 242 mOrgCap = topLevelWidget()->caption();
242} 243}
243 244
244void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) 245void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e )
245{ 246{
246 int diff = mMouseDownY - e->pos().y(); 247 int diff = mMouseDownY - e->pos().y();
247 if ( diff < 10 && diff > -10 ) 248 if ( diff < 10 && diff > -10 )
@@ -357,130 +358,129 @@ void EventIndicator::setXOffset( int x )
357void EventIndicator::setPaintWidget( KDGanttMinimizeSplitter * w ) 358void EventIndicator::setPaintWidget( KDGanttMinimizeSplitter * w )
358{ 359{
359 mPaintWidget = w; 360 mPaintWidget = w;
360 setMaximumHeight(0); 361 setMaximumHeight(0);
361 setMinimumHeight(0); 362 setMinimumHeight(0);
362} 363}
363void EventIndicator::changeColumns(int columns) 364void EventIndicator::changeColumns(int columns)
364{ 365{
365 mColumns = columns; 366 mColumns = columns;
366 mEnabled.resize(mColumns); 367 mEnabled.resize(mColumns);
367 368
368 update(); 369 update();
369} 370}
370 371
371void EventIndicator::enableColumn(int column, bool enable) 372void EventIndicator::enableColumn(int column, bool enable)
372{ 373{
373 mEnabled[column] = enable; 374 mEnabled[column] = enable;
374} 375}
375 376
376 377
377//////////////////////////////////////////////////////////////////////////// 378////////////////////////////////////////////////////////////////////////////
378//////////////////////////////////////////////////////////////////////////// 379////////////////////////////////////////////////////////////////////////////
379//////////////////////////////////////////////////////////////////////////// 380////////////////////////////////////////////////////////////////////////////
380 381
381KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : 382KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
382 KOEventView (cal,parent,name) 383 KOEventView (cal,parent,name)
383{ 384{
384 mBlockUpdating = true; 385 mBlockUpdating = true;
385 mStartHour = 8; 386 mStartHour = 8;
386 mSelectedDates.append(QDate::currentDate()); 387 mSelectedDates.append(QDate::currentDate());
387 388
388 mLayoutDayLabels = 0; 389 mLayoutDayLabels = 0;
389 mDayLabelsFrame = 0; 390 mDayLabelsFrame = 0;
390 mDayLabels = 0; 391 mDayLabels = 0;
391 bool isRTL = KOGlobals::self()->reverseLayout(); 392 bool isRTL = KOGlobals::self()->reverseLayout();
392 QPixmap expandPix; 393 QPixmap expandPix;
393 if ( KOPrefs::instance()->mVerticalScreen ) { 394 if ( KOPrefs::instance()->mVerticalScreen ) {
394 expandPix = SmallIcon( "1updownarrow" ); 395 expandPix = SmallIcon( "1updownarrow" );
395 } else { 396 } else {
396 expandPix = SmallIcon("1leftrightarrow" ); 397 expandPix = SmallIcon("1leftrightarrow" );
397 } 398 }
398 399
399 QBoxLayout *topLayout = new QVBoxLayout(this); 400 QBoxLayout *topLayout = new QVBoxLayout(this);
400 401
401 // Create day name labels for agenda columns 402 // Create day name labels for agenda columns
402 // Create agenda splitter 403 // Create agenda splitter
403 404
404 mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this); 405 mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this);
405 mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); 406 mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
406 topLayout->addWidget( mSplitterAgenda ); 407 topLayout->addWidget( mSplitterAgenda );
407 mAllDayFrame = new QHBox(mSplitterAgenda); 408 mAllDayFrame = new QHBox(mSplitterAgenda);
408 mAllDayFrame->setFocusPolicy(NoFocus); 409 mAllDayFrame->setFocusPolicy(NoFocus);
409 QWidget *agendaFrame = new QWidget(mSplitterAgenda); 410 QWidget *agendaFrame = new QWidget(mSplitterAgenda);
410 agendaFrame->setFocusPolicy(NoFocus); 411 agendaFrame->setFocusPolicy(NoFocus);
411 412
412 // Create all-day agenda widget 413 // Create all-day agenda widget
413 mDummyAllDayLeft = new QVBox( mAllDayFrame ); 414 mDummyAllDayLeft = new QVBox( mAllDayFrame );
414 415
415 mExpandButton = new QPushButton(mDummyAllDayLeft); 416 mExpandButton = new QPushButton(mDummyAllDayLeft);
416 mExpandButton->setPixmap( expandPix ); 417 mExpandButton->setPixmap( expandPix );
417 int widebut = mExpandButton->sizeHint().width()+4; 418 int widebut = mExpandButton->sizeHint().width()+4;
418 int heibut = mExpandButton->sizeHint().height()+4; 419 int heibut = mExpandButton->sizeHint().height()+4;
419 if ( heibut > widebut ) 420 if ( heibut > widebut )
420 widebut = heibut ; 421 widebut = heibut ;
421 if ( QApplication::desktop()->width() < 480 ) 422
422 widebut = widebut*3/2;
423 //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, 423 //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed,
424 // QSizePolicy::Fixed ) ); 424 // QSizePolicy::Fixed ) );
425 mExpandButton->setFixedSize( widebut, widebut); 425 mExpandButton->setFixedSize( widebut, widebut);
426 connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) ); 426 connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) );
427 mExpandButton->setFocusPolicy(NoFocus); 427 mExpandButton->setFocusPolicy(NoFocus);
428 mAllDayAgenda = new KOAgenda(1,mAllDayFrame); 428 mAllDayAgenda = new KOAgenda(1,mAllDayFrame);
429 mAllDayAgenda->setFocusPolicy(NoFocus); 429 mAllDayAgenda->setFocusPolicy(NoFocus);
430 QLabel *dummyAllDayRight = new QLabel (mAllDayFrame); 430 QLabel *dummyAllDayRight = new QLabel (mAllDayFrame);
431 431
432 // Create event context menu for all day agenda 432 // Create event context menu for all day agenda
433 mAllDayAgendaPopup = eventPopup(); 433 mAllDayAgendaPopup = eventPopup();
434 connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), 434 connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
435 mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *))); 435 mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
436 436
437 // Create agenda frame 437 // Create agenda frame
438 QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3); 438 QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3);
439 // QHBox *agendaFrame = new QHBox(splitterAgenda); 439 // QHBox *agendaFrame = new QHBox(splitterAgenda);
440 440
441 // create event indicator bars 441 // create event indicator bars
442 mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame); 442 mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame);
443#ifndef DESKTOP_VERSION 443#ifndef DESKTOP_VERSION
444 // FIX 444 // FIX
445 mEventIndicatorTop->setPaintWidget( mSplitterAgenda ); 445 mEventIndicatorTop->setPaintWidget( mSplitterAgenda );
446#endif 446#endif
447 mDayLabelsFrame = new QHBox(agendaFrame); 447 mDayLabelsFrame = new QHBox(agendaFrame);
448 //topLayout->addWidget(mDayLabelsFrame); 448 //topLayout->addWidget(mDayLabelsFrame);
449 mDayLabels = new QFrame (mDayLabelsFrame); 449 mDayLabels = new QFrame (mDayLabelsFrame);
450 mLayoutDayLabels = new QHBoxLayout(mDayLabels); 450 mLayoutDayLabels = new QHBoxLayout(mDayLabels);
451 agendaLayout->addMultiCellWidget(mDayLabelsFrame ,0,0,0,2); 451 agendaLayout->addMultiCellWidget(mDayLabelsFrame ,0,0,0,2);
452 agendaLayout->addWidget(mEventIndicatorTop,1,1); 452 agendaLayout->addWidget(mEventIndicatorTop,1,1);
453 453
454 mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom, 454 mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom,
455 agendaFrame); 455 agendaFrame);
456 agendaLayout->addWidget(mEventIndicatorBottom,3,1); 456 agendaLayout->addWidget(mEventIndicatorBottom,3,1);
457 QWidget *dummyAgendaRight = new QWidget(agendaFrame); 457 QWidget *dummyAgendaRight = new QWidget(agendaFrame);
458 agendaLayout->addWidget(dummyAgendaRight,1,2); 458 agendaLayout->addWidget(dummyAgendaRight,1,2);
459 459
460 // Create time labels 460 // Create time labels
461 mTimeLabels = new TimeLabels(24,agendaFrame); 461 mTimeLabels = new TimeLabels(24,agendaFrame);
462 agendaLayout->addWidget(mTimeLabels,2,0); 462 agendaLayout->addWidget(mTimeLabels,2,0);
463 connect(mTimeLabels,SIGNAL( scaleChanged()), 463 connect(mTimeLabels,SIGNAL( scaleChanged()),
464 this,SLOT(updateConfig())); 464 this,SLOT(updateConfig()));
465 465
466 // Create agenda 466 // Create agenda
467 mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame); 467 mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame);
468 agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2); 468 agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2);
469 agendaLayout->setColStretch(1,1); 469 agendaLayout->setColStretch(1,1);
470 mAgenda->setFocusPolicy(NoFocus); 470 mAgenda->setFocusPolicy(NoFocus);
471 // Create event context menu for agenda 471 // Create event context menu for agenda
472 mAgendaPopup = eventPopup(); 472 mAgendaPopup = eventPopup();
473 473
474 mAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")), 474 mAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
475 i18n("Toggle Alarm"),mAgenda, 475 i18n("Toggle Alarm"),mAgenda,
476 SLOT(popupAlarm()),true); 476 SLOT(popupAlarm()),true);
477 477
478 478
479 connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), 479 connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
480 mAgendaPopup,SLOT(showIncidencePopup(Incidence *))); 480 mAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
481 481
482 // make connections between dependent widgets 482 // make connections between dependent widgets
483 mTimeLabels->setAgenda(mAgenda); 483 mTimeLabels->setAgenda(mAgenda);
484 484
485 // Update widgets to reflect user preferences 485 // Update widgets to reflect user preferences
486 // updateConfig(); 486 // updateConfig();
@@ -656,241 +656,241 @@ void KOAgendaView::createDayLabels()
656 return; 656 return;
657 657
658 } 658 }
659 int newHight; 659 int newHight;
660 660
661 // ### Before deleting and recreating we could check if mSelectedDates changed... 661 // ### Before deleting and recreating we could check if mSelectedDates changed...
662 // It would remove some flickering and gain speed (since this is called by 662 // It would remove some flickering and gain speed (since this is called by
663 // each updateView() call) 663 // each updateView() call)
664 664
665 int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2; 665 int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2;
666 mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); 666 mDayLabelsFrame->setMaximumWidth( mUpcomingWidth );
667 if ( maxWid < 0 ) 667 if ( maxWid < 0 )
668 maxWid = 20; 668 maxWid = 20;
669 669
670 QFont dlf = KOPrefs::instance()->mTimeLabelsFont; 670 QFont dlf = KOPrefs::instance()->mTimeLabelsFont;
671 QFontMetrics fm ( dlf ); 671 QFontMetrics fm ( dlf );
672 int selCount = mSelectedDates.count(); 672 int selCount = mSelectedDates.count();
673 QString dayTest = "Mon 20"; 673 QString dayTest = "Mon 20";
674 //QString dayTest = "Mon 20"; 674 //QString dayTest = "Mon 20";
675 int wid = fm.width( dayTest ); 675 int wid = fm.width( dayTest );
676 //maxWid -= ( selCount * 3 ); //working for QLabels 676 //maxWid -= ( selCount * 3 ); //working for QLabels
677 maxWid -= ( selCount * 3 ); //working for QPushButton 677 maxWid -= ( selCount * 3 ); //working for QPushButton
678 if ( maxWid < 0 ) 678 if ( maxWid < 0 )
679 maxWid = 20; 679 maxWid = 20;
680 int needWid = wid * selCount; 680 int needWid = wid * selCount;
681 //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); 681 //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid );
682 //if ( needWid > maxWid ) 682 //if ( needWid > maxWid )
683 // qDebug("DAYLABELS TOOOOOOO BIG "); 683 // qDebug("DAYLABELS TOOOOOOO BIG ");
684 while ( needWid > maxWid ) { 684 while ( needWid > maxWid ) {
685 dayTest = dayTest.left( dayTest.length() - 1 ); 685 dayTest = dayTest.left( dayTest.length() - 1 );
686 wid = fm.width( dayTest ); 686 wid = fm.width( dayTest );
687 needWid = wid * selCount; 687 needWid = wid * selCount;
688 } 688 }
689 int maxLen = dayTest.length(); 689 int maxLen = dayTest.length();
690 int fontPoint = dlf.pointSize(); 690 int fontPoint = dlf.pointSize();
691 if ( maxLen < 2 ) { 691 if ( maxLen < 2 ) {
692 int fontPoint = dlf.pointSize(); 692 int fontPoint = dlf.pointSize();
693 while ( fontPoint > 4 ) { 693 while ( fontPoint > 4 ) {
694 --fontPoint; 694 --fontPoint;
695 dlf.setPointSize( fontPoint ); 695 dlf.setPointSize( fontPoint );
696 QFontMetrics f( dlf ); 696 QFontMetrics f( dlf );
697 wid = f.width( "30" ); 697 wid = f.width( "30" );
698 needWid = wid * selCount; 698 needWid = wid * selCount;
699 if ( needWid < maxWid ) 699 if ( needWid < maxWid )
700 break; 700 break;
701 } 701 }
702 maxLen = 2; 702 maxLen = 2;
703 } 703 }
704 //qDebug("Max len %d ", dayTest.length() ); 704 //qDebug("Max len %d ", dayTest.length() );
705 705
706 QFontMetrics tempF( dlf ); 706 QFontMetrics tempF( dlf );
707 newHight = tempF.height(); 707 newHight = tempF.height();
708 mDayLabels->setFont( dlf ); 708 mDayLabels->setFont( dlf );
709 // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; 709 // mLayoutDayLabels = new QHBoxLayout(mDayLabels);;
710 // mLayoutDayLabels->addSpacing(mTimeLabels->width()); 710 // mLayoutDayLabels->addSpacing(mTimeLabels->width());
711 //mLayoutDayLabels->addSpacing( 2 ); 711 //mLayoutDayLabels->addSpacing( 2 );
712 // QFont lFont = dlf; 712 // QFont lFont = dlf;
713 bool appendLabels = false; 713 bool appendLabels = false;
714 KOAgendaButton *dayLabel; 714 KOAgendaButton *dayLabel;
715 dayLabel = mDayLabelsList.first(); 715 dayLabel = mDayLabelsList.first();
716 if ( !dayLabel ) { 716 if ( !dayLabel ) {
717 appendLabels = true; 717 appendLabels = true;
718 dayLabel = getNewDaylabel(); 718 dayLabel = getNewDaylabel();
719 } 719 }
720 dayLabel->setFixedWidth( mTimeLabels->width()+2 ); 720 dayLabel->setFixedWidth( mTimeLabels->width()+mAgenda->frameWidth() );
721 dayLabel->setFont( dlf ); 721 dayLabel->setFont( dlf );
722 dayLabel->setNum( -1 ); 722 dayLabel->setNum( -1 );
723 //dayLabel->setAlignment(QLabel::AlignHCenter); 723 //dayLabel->setAlignment(QLabel::AlignHCenter);
724 dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); 724 dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) );
725 dayLabel->show(); 725 dayLabel->show();
726 DateList::ConstIterator dit; 726 DateList::ConstIterator dit;
727 bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); 727 bool oneday = (mSelectedDates.first() == mSelectedDates.last() );
728 int counter = -1; 728 int counter = -1;
729 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { 729 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
730 ++counter; 730 ++counter;
731 QDate date = *dit; 731 QDate date = *dit;
732 // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); 732 // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels);
733 if ( ! appendLabels ) { 733 if ( ! appendLabels ) {
734 dayLabel = mDayLabelsList.next(); 734 dayLabel = mDayLabelsList.next();
735 if ( !dayLabel ) 735 if ( !dayLabel )
736 appendLabels = true; 736 appendLabels = true;
737 } 737 }
738 if ( appendLabels ) { 738 if ( appendLabels ) {
739 dayLabel = getNewDaylabel(); 739 dayLabel = getNewDaylabel();
740 } 740 }
741 dayLabel->setMinimumWidth( 1 ); 741 dayLabel->setMinimumWidth( 1 );
742 dayLabel->setMaximumWidth( 10240 ); 742 dayLabel->setMaximumWidth( 10240 );
743 dayLabel->setFont( dlf ); 743 dayLabel->setFont( dlf );
744 dayLabel->show(); 744 dayLabel->show();
745 dayLabel->setAutoRepeat( false ); 745 dayLabel->setAutoRepeat( false );
746 dayLabel->setNum( counter ); 746 dayLabel->setNum( counter );
747 QString str; 747 QString str;
748 int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); 748 int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date);
749 QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); 749 QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true );
750 switch ( maxLen ) { 750 switch ( maxLen ) {
751 case 2: 751 case 2:
752 str = QString::number( date.day() ); 752 str = QString::number( date.day() );
753 break; 753 break;
754 754
755 case 3: 755 case 3:
756 str = dayName.left( 1 ) +QString::number( date.day()); 756 str = dayName.left( 1 ) +QString::number( date.day());
757 757
758 break; 758 break;
759 case 4: 759 case 4:
760 str = dayName.left( 1 ) + " " +QString::number( date.day()); 760 str = dayName.left( 1 ) + " " +QString::number( date.day());
761 761
762 break; 762 break;
763 case 5: 763 case 5:
764 str = dayName.left( 2 ) + " " +QString::number( date.day()); 764 str = dayName.left( 2 ) + " " +QString::number( date.day());
765 765
766 break; 766 break;
767 case 6: 767 case 6:
768 str = dayName.left( 3 ) + " " +QString::number( date.day()); 768 str = dayName.left( 3 ) + " " +QString::number( date.day());
769 break; 769 break;
770 770
771 default: 771 default:
772 break; 772 break;
773 } 773 }
774 if ( oneday ) { 774 if ( oneday ) {
775 QString addString; 775 QString addString;
776 if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) 776 if ( mSelectedDates.first() == QDateTime::currentDateTime().date() )
777 addString = i18n("Today"); 777 addString = i18n("Today");
778 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) 778 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) )
779 addString = i18n("Tomorrow"); 779 addString = i18n("Tomorrow");
780 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) 780 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) )
781 addString = i18n("Yesterday"); 781 addString = i18n("Yesterday");
782 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) 782 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) )
783 addString = i18n("Day before yesterday"); 783 addString = i18n("Day before yesterday");
784 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) 784 else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) )
785 addString = i18n("Day after tomorrow"); 785 addString = i18n("Day after tomorrow");
786 if ( !addString.isEmpty() ) { 786 if ( !addString.isEmpty() ) {
787 str = addString+", " + str; 787 str = addString+", " + str;
788 } else { 788 } else {
789 str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); 789 str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer);
790 } 790 }
791 } 791 }
792 dayLabel->setText(str); 792 dayLabel->setText(str);
793 //dayLabel->setAlignment(QLabel::AlignHCenter); 793 //dayLabel->setAlignment(QLabel::AlignHCenter);
794 if (date == QDate::currentDate()) { 794 if (date == QDate::currentDate()) {
795 QFont bFont = dlf; 795 QFont bFont = dlf;
796 bFont.setBold( true ); 796 bFont.setBold( true );
797 dayLabel->setFont(bFont); 797 dayLabel->setFont(bFont);
798 } 798 }
799 //dayLayout->addWidget(dayLabel); 799 //dayLayout->addWidget(dayLabel);
800 800
801#ifndef KORG_NOPLUGINS 801#ifndef KORG_NOPLUGINS
802 CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); 802 CalendarDecoration::List cds = KOCore::self()->calendarDecorations();
803 CalendarDecoration *it; 803 CalendarDecoration *it;
804 for(it = cds.first(); it; it = cds.next()) { 804 for(it = cds.first(); it; it = cds.next()) {
805 QString text = it->shortText( date ); 805 QString text = it->shortText( date );
806 if ( !text.isEmpty() ) { 806 if ( !text.isEmpty() ) {
807 QLabel *label = new QLabel(text,mDayLabels); 807 QLabel *label = new QLabel(text,mDayLabels);
808 label->setAlignment(AlignCenter); 808 label->setAlignment(AlignCenter);
809 dayLayout->addWidget(label); 809 dayLayout->addWidget(label);
810 } 810 }
811 } 811 }
812 812
813 for(it = cds.first(); it; it = cds.next()) { 813 for(it = cds.first(); it; it = cds.next()) {
814 QWidget *wid = it->smallWidget(mDayLabels,date); 814 QWidget *wid = it->smallWidget(mDayLabels,date);
815 if ( wid ) { 815 if ( wid ) {
816 // wid->setHeight(20); 816 // wid->setHeight(20);
817 dayLayout->addWidget(wid); 817 dayLayout->addWidget(wid);
818 } 818 }
819 } 819 }
820#endif 820#endif
821 } 821 }
822 if ( ! appendLabels ) { 822 if ( ! appendLabels ) {
823 dayLabel = mDayLabelsList.next(); 823 dayLabel = mDayLabelsList.next();
824 if ( !dayLabel ) 824 if ( !dayLabel )
825 appendLabels = true; 825 appendLabels = true;
826 } 826 }
827 if ( appendLabels ) { 827 if ( appendLabels ) {
828 dayLabel = getNewDaylabel(); 828 dayLabel = getNewDaylabel();
829 } 829 }
830 //dayLabel->hide();//test only 830 //dayLabel->hide();//test only
831 831 qDebug("fremwidd %d ", mAgenda->frameWidth());
832 int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; 832 int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()- (mAgenda->frameWidth()*2) ) % mSelectedDates.count() ;
833 if ( offset < 0 ) offset = 0; 833 if ( offset < 0 ) offset = 0;
834 //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); 834 //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 );
835 dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); 835 dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) );
836 dayLabel->setFont( dlf ); 836 dayLabel->setFont( dlf );
837 dayLabel->setAutoRepeat( true ); 837 dayLabel->setAutoRepeat( true );
838 dayLabel->show(); 838 dayLabel->show();
839 dayLabel->setNum( -2 ); 839 dayLabel->setNum( -2 );
840 dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); 840 dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset );
841 //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); 841 //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2);
842 //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); 842 //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2);
843 if ( !appendLabels ) { 843 if ( !appendLabels ) {
844 dayLabel = mDayLabelsList.next(); 844 dayLabel = mDayLabelsList.next();
845 while ( dayLabel ) { 845 while ( dayLabel ) {
846 //qDebug("!dayLabel %d",dayLabel ); 846 //qDebug("!dayLabel %d",dayLabel );
847 dayLabel->hide(); 847 dayLabel->hide();
848 dayLabel = mDayLabelsList.next(); 848 dayLabel = mDayLabelsList.next();
849 } 849 }
850 } 850 }
851 851
852 mDayLabelsFrame->setFixedHeight( newHight + 4 ); 852 mDayLabelsFrame->setFixedHeight( newHight + 4 );
853} 853}
854 854
855int KOAgendaView::maxDatesHint() 855int KOAgendaView::maxDatesHint()
856{ 856{
857 // Not sure about the max number of events, so return 0 for now. 857 // Not sure about the max number of events, so return 0 for now.
858 return 0; 858 return 0;
859} 859}
860 860
861int KOAgendaView::currentDateCount() 861int KOAgendaView::currentDateCount()
862{ 862{
863 return mSelectedDates.count(); 863 return mSelectedDates.count();
864} 864}
865 865
866QPtrList<Incidence> KOAgendaView::selectedIncidences() 866QPtrList<Incidence> KOAgendaView::selectedIncidences()
867{ 867{
868 QPtrList<Incidence> selected; 868 QPtrList<Incidence> selected;
869 Incidence *incidence; 869 Incidence *incidence;
870 870
871 incidence = mAgenda->selectedIncidence(); 871 incidence = mAgenda->selectedIncidence();
872 if (incidence) selected.append(incidence); 872 if (incidence) selected.append(incidence);
873 873
874 incidence = mAllDayAgenda->selectedIncidence(); 874 incidence = mAllDayAgenda->selectedIncidence();
875 if (incidence) selected.append(incidence); 875 if (incidence) selected.append(incidence);
876 876
877 return selected; 877 return selected;
878} 878}
879 879
880DateList KOAgendaView::selectedDates() 880DateList KOAgendaView::selectedDates()
881{ 881{
882 DateList selected; 882 DateList selected;
883 QDate qd; 883 QDate qd;
884 884
885 qd = mAgenda->selectedIncidenceDate(); 885 qd = mAgenda->selectedIncidenceDate();
886 if (qd.isValid()) selected.append(qd); 886 if (qd.isValid()) selected.append(qd);
887 887
888 qd = mAllDayAgenda->selectedIncidenceDate(); 888 qd = mAllDayAgenda->selectedIncidenceDate();
889 if (qd.isValid()) selected.append(qd); 889 if (qd.isValid()) selected.append(qd);
890 890
891 return selected; 891 return selected;
892} 892}
893 893
894 894
895void KOAgendaView::updateView() 895void KOAgendaView::updateView()
896{ 896{
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index dfc6af7..c55f7d7 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -227,129 +227,130 @@ void KODayMatrix::setCalendar( Calendar *cal )
227QColor KODayMatrix::getShadedColor(QColor color) 227QColor KODayMatrix::getShadedColor(QColor color)
228{ 228{
229 QColor shaded; 229 QColor shaded;
230 int h=0; 230 int h=0;
231 int s=0; 231 int s=0;
232 int v=0; 232 int v=0;
233 color.hsv(&h,&s,&v); 233 color.hsv(&h,&s,&v);
234 s = s/4; 234 s = s/4;
235 v = 192+v/4; 235 v = 192+v/4;
236 shaded.setHsv(h,s,v); 236 shaded.setHsv(h,s,v);
237 237
238 return shaded; 238 return shaded;
239} 239}
240 240
241KODayMatrix::~KODayMatrix() 241KODayMatrix::~KODayMatrix()
242{ 242{
243 // delete mKODaymatrixWhatsThis; 243 // delete mKODaymatrixWhatsThis;
244 delete [] days; 244 delete [] days;
245 delete [] daylbls; 245 delete [] daylbls;
246 //delete [] events; 246 //delete [] events;
247 delete mToolTip; 247 delete mToolTip;
248} 248}
249 249
250/* 250/*
251void KODayMatrix::setStartDate(QDate start) 251void KODayMatrix::setStartDate(QDate start)
252{ 252{
253 updateView(start); 253 updateView(start);
254} 254}
255*/ 255*/
256 256
257void KODayMatrix::addSelectedDaysTo(DateList& selDays) 257void KODayMatrix::addSelectedDaysTo(DateList& selDays)
258{ 258{
259 259
260 if (mSelStart == NOSELECTION) { 260 if (mSelStart == NOSELECTION) {
261 return; 261 return;
262 } 262 }
263 263
264 //cope with selection being out of matrix limits at top (< 0) 264 //cope with selection being out of matrix limits at top (< 0)
265 int i0 = mSelStart; 265 int i0 = mSelStart;
266 if (i0 < 0) { 266 if (i0 < 0) {
267 for (int i = i0; i < 0; i++) { 267 for (int i = i0; i < 0; i++) {
268 selDays.append(days[0].addDays(i)); 268 selDays.append(days[0].addDays(i));
269 } 269 }
270 i0 = 0; 270 i0 = 0;
271 } 271 }
272 272
273 //cope with selection being out of matrix limits at bottom (> NUMDAYS-1) 273 //cope with selection being out of matrix limits at bottom (> NUMDAYS-1)
274 if (mSelEnd > NUMDAYS-1) { 274 if (mSelEnd > NUMDAYS-1) {
275 for (int i = i0; i <= NUMDAYS-1; i++) { 275 for (int i = i0; i <= NUMDAYS-1; i++) {
276 selDays.append(days[i]); 276 selDays.append(days[i]);
277 } 277 }
278 for (int i = NUMDAYS; i < mSelEnd; i++) { 278 for (int i = NUMDAYS; i < mSelEnd; i++) {
279 selDays.append(days[0].addDays(i)); 279 selDays.append(days[0].addDays(i));
280 } 280 }
281 281
282 // apply normal routine to selection being entirely within matrix limits 282 // apply normal routine to selection being entirely within matrix limits
283 } else { 283 } else {
284 for (int i = i0; i <= mSelEnd; i++) { 284 for (int i = i0; i <= mSelEnd; i++) {
285 selDays.append(days[i]); 285 selDays.append(days[i]);
286 } 286 }
287 } 287 }
288} 288}
289 289
290bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end) 290bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end)
291{ 291{
292 mRedrawNeeded = true;
292 bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION ); 293 bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION );
293 mSelStart = startdate.daysTo(start); 294 mSelStart = startdate.daysTo(start);
294 if ( mSelStart < 0 ) 295 if ( mSelStart < 0 )
295 mSelStart = 0; 296 mSelStart = 0;
296 mSelEnd = startdate.daysTo(end); 297 mSelEnd = startdate.daysTo(end);
297 if ( mSelEnd > NUMDAYS-1 ) 298 if ( mSelEnd > NUMDAYS-1 )
298 mSelEnd = NUMDAYS-1; 299 mSelEnd = NUMDAYS-1;
299 if ( mSelEnd < 0 || mSelStart > NUMDAYS-1 ) { 300 if ( mSelEnd < 0 || mSelStart > NUMDAYS-1 ) {
300 clearSelection(); 301 clearSelection();
301 if ( noSel ) 302 if ( noSel )
302 return false; 303 return false;
303 } 304 }
304 305
305 return true; 306 return true;
306} 307}
307void KODayMatrix::clearSelection() 308void KODayMatrix::clearSelection()
308{ 309{
309 mSelEnd = mSelStart = NOSELECTION; 310 mSelEnd = mSelStart = NOSELECTION;
310} 311}
311 312
312 313
313void KODayMatrix::recalculateToday() 314void KODayMatrix::recalculateToday()
314{ 315{
315 today = -1; 316 today = -1;
316 for (int i=0; i<NUMDAYS; i++) { 317 for (int i=0; i<NUMDAYS; i++) {
317 //events[i] = 0; 318 //events[i] = 0;
318 days[i] = startdate.addDays(i); 319 days[i] = startdate.addDays(i);
319 daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] )); 320 daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] ));
320 321
321 // if today is in the currently displayed month, hilight today 322 // if today is in the currently displayed month, hilight today
322 if (days[i].year() == QDate::currentDate().year() && 323 if (days[i].year() == QDate::currentDate().year() &&
323 days[i].month() == QDate::currentDate().month() && 324 days[i].month() == QDate::currentDate().month() &&
324 days[i].day() == QDate::currentDate().day()) { 325 days[i].day() == QDate::currentDate().day()) {
325 today = i; 326 today = i;
326 } 327 }
327 } 328 }
328 // qDebug(QString("Today is visible at %1.").arg(today)); 329 // qDebug(QString("Today is visible at %1.").arg(today));
329} 330}
330 331
331void KODayMatrix::updateView() 332void KODayMatrix::updateView()
332{ 333{
333 updateView(startdate); 334 updateView(startdate);
334} 335}
335void KODayMatrix::repaintViewTimed() 336void KODayMatrix::repaintViewTimed()
336{ 337{
337 mRepaintTimer->stop(); 338 mRepaintTimer->stop();
338 repaint(false); 339 repaint(false);
339} 340}
340void KODayMatrix::updateViewTimed() 341void KODayMatrix::updateViewTimed()
341{ 342{
342 mUpdateTimer->stop(); 343 mUpdateTimer->stop();
343 if ( !mCalendar ) { 344 if ( !mCalendar ) {
344 qDebug("NOT CAL "); 345 qDebug("NOT CAL ");
345 return; 346 return;
346 } 347 }
347 //qDebug("KODayMatrix::updateViewTimed "); 348 //qDebug("KODayMatrix::updateViewTimed ");
348 for(int i = 0; i < NUMDAYS; i++) { 349 for(int i = 0; i < NUMDAYS; i++) {
349 // if events are set for the day then remember to draw it bold 350 // if events are set for the day then remember to draw it bold
350 QPtrList<Event> eventlist = mCalendar->events(days[i]); 351 QPtrList<Event> eventlist = mCalendar->events(days[i]);
351 Event *event; 352 Event *event;
352 int numEvents = eventlist.count(); 353 int numEvents = eventlist.count();
353 QString holiStr = ""; 354 QString holiStr = "";
354 bDays.clearBit(i); 355 bDays.clearBit(i);
355 hDays.clearBit(i); 356 hDays.clearBit(i);
@@ -449,174 +450,177 @@ void KODayMatrix::updateEvents()
449 Event *event; 450 Event *event;
450 for( event = eventlist.first(); event != 0;event=eventlist.next()) { 451 for( event = eventlist.first(); event != 0;event=eventlist.next()) {
451 ushort recurType = event->doesRecur(); 452 ushort recurType = event->doesRecur();
452 453
453 if ( ( recurType == Recurrence::rDaily && 454 if ( ( recurType == Recurrence::rDaily &&
454 !KOPrefs::instance()->mDailyRecur ) || 455 !KOPrefs::instance()->mDailyRecur ) ||
455 ( recurType == Recurrence::rWeekly && 456 ( recurType == Recurrence::rWeekly &&
456 !KOPrefs::instance()->mWeeklyRecur ) ) { 457 !KOPrefs::instance()->mWeeklyRecur ) ) {
457 numEvents--; 458 numEvents--;
458 } 459 }
459 } 460 }
460 if ( numEvents ) 461 if ( numEvents )
461 eDays.setBit(i); 462 eDays.setBit(i);
462 else 463 else
463 eDays.clearBit(i); 464 eDays.clearBit(i);
464 } 465 }
465} 466}
466 467
467const QDate& KODayMatrix::getDate(int offset) 468const QDate& KODayMatrix::getDate(int offset)
468{ 469{
469 if (offset < 0 || offset > NUMDAYS-1) { 470 if (offset < 0 || offset > NUMDAYS-1) {
470 qDebug("Wrong offset2 %d", offset); 471 qDebug("Wrong offset2 %d", offset);
471 return days[0]; 472 return days[0];
472 } 473 }
473 return days[offset]; 474 return days[offset];
474} 475}
475 476
476QString KODayMatrix::getHolidayLabel(int offset) 477QString KODayMatrix::getHolidayLabel(int offset)
477{ 478{
478 if (offset < 0 || offset > NUMDAYS-1) { 479 if (offset < 0 || offset > NUMDAYS-1) {
479 qDebug("Wrong offset1 %d", offset); 480 qDebug("Wrong offset1 %d", offset);
480 return QString(); 481 return QString();
481 } 482 }
482 return mHolidays[offset]; 483 return mHolidays[offset];
483} 484}
484 485
485int KODayMatrix::getDayIndexFrom(int x, int y) 486int KODayMatrix::getDayIndexFrom(int x, int y)
486{ 487{
487 int colModulo = (width()-2) % 7; 488 int colModulo = (width()-2) % 7;
488 int rowModulo = (height()-2) % 6; 489 int rowModulo = (height()-2) % 6;
489#if 0 490#if 0
490 return 7*(y/daysize.height()) + (KOGlobals::self()->reverseLayout() ? 491 return 7*(y/daysize.height()) + (KOGlobals::self()->reverseLayout() ?
491 6 - x/daysize.width() : x/daysize.width()); 492 6 - x/daysize.width() : x/daysize.width());
492#endif 493#endif
493 int xVal = (x-colModulo/2-2)/daysize.width(); 494 int xVal = (x-colModulo/2-2)/daysize.width();
494 int yVal = (y-rowModulo/2-2)/daysize.height(); 495 int yVal = (y-rowModulo/2-2)/daysize.height();
495 496
496 497
497 return 7*(yVal) + xVal; 498 return 7*(yVal) + xVal;
498 499
499} 500}
500 501
501// ---------------------------------------------------------------------------- 502// ----------------------------------------------------------------------------
502// M O U S E E V E N T H A N D L I N G 503// M O U S E E V E N T H A N D L I N G
503// ---------------------------------------------------------------------------- 504// ----------------------------------------------------------------------------
504 505
505void KODayMatrix::mousePressEvent (QMouseEvent* e) 506void KODayMatrix::mousePressEvent (QMouseEvent* e)
506{ 507{
507 508
508 if ( e->button() == LeftButton ) 509 if ( e->button() == LeftButton )
509 mouseDown = true; 510 mouseDown = true;
510 mSelStart = getDayIndexFrom(e->x(), e->y()); 511 mSelStart = getDayIndexFrom(e->x(), e->y());
511 if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1; 512 if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1;
512 mSelInit = mSelStart; 513 mSelInit = mSelStart;
513 mSelEnd = mSelStart; 514 mSelEnd = mSelStart;
515 mRedrawNeeded = true;
514 repaint(false); 516 repaint(false);
515} 517}
516 518
517void KODayMatrix::mouseReleaseEvent (QMouseEvent* e) 519void KODayMatrix::mouseReleaseEvent (QMouseEvent* e)
518{ 520{
521 mRedrawNeeded = true;
519 if ( e->button() == LeftButton ) 522 if ( e->button() == LeftButton )
520 if ( ! mouseDown ) { 523 if ( ! mouseDown ) {
521 return; 524 return;
522 } 525 }
523 else 526 else
524 mouseDown = false; 527 mouseDown = false;
525 int tmp = getDayIndexFrom(e->x(), e->y()); 528 int tmp = getDayIndexFrom(e->x(), e->y());
526 if (tmp > NUMDAYS-1) tmp=NUMDAYS-1; 529 if (tmp > NUMDAYS-1) tmp=NUMDAYS-1;
527 530
528 if (mSelInit > tmp) { 531 if (mSelInit > tmp) {
529 mSelEnd = mSelInit; 532 mSelEnd = mSelInit;
530 if (tmp != mSelStart) { 533 if (tmp != mSelStart) {
531 mSelStart = tmp; 534 mSelStart = tmp;
532 repaint(false); 535 repaint(false);
533 } 536 }
534 } else { 537 } else {
535 mSelStart = mSelInit; 538 mSelStart = mSelInit;
536 539
537 //repaint only if selection has changed 540 //repaint only if selection has changed
538 if (tmp != mSelEnd) { 541 if (tmp != mSelEnd) {
539 mSelEnd = tmp; 542 mSelEnd = tmp;
540 repaint(false); 543 repaint(false);
541 } 544 }
542 } 545 }
543 546
544 DateList daylist; 547 DateList daylist;
545 if ( mSelStart < 0 ) 548 if ( mSelStart < 0 )
546 mSelStart = 0; 549 mSelStart = 0;
547 for (int i = mSelStart; i <= mSelEnd; i++) { 550 for (int i = mSelStart; i <= mSelEnd; i++) {
548 daylist.append(days[i]); 551 daylist.append(days[i]);
549 } 552 }
550 emit selected((const DateList)daylist); 553 emit selected((const DateList)daylist);
551 554
552} 555}
553 556
554void KODayMatrix::mouseMoveEvent (QMouseEvent* e) 557void KODayMatrix::mouseMoveEvent (QMouseEvent* e)
555{ 558{
556 if ( ! mouseDown ) { 559 if ( ! mouseDown ) {
557 return; 560 return;
558 } 561 }
562 mRedrawNeeded = true;
559 int tmp = getDayIndexFrom(e->x(), e->y()); 563 int tmp = getDayIndexFrom(e->x(), e->y());
560 if (tmp > NUMDAYS-1) tmp=NUMDAYS-1; 564 if (tmp > NUMDAYS-1) tmp=NUMDAYS-1;
561 565
562 if (mSelInit > tmp) { 566 if (mSelInit > tmp) {
563 mSelEnd = mSelInit; 567 mSelEnd = mSelInit;
564 if (tmp != mSelStart) { 568 if (tmp != mSelStart) {
565 mSelStart = tmp; 569 mSelStart = tmp;
566 repaint(false); 570 repaint(false);
567 } 571 }
568 } else { 572 } else {
569 mSelStart = mSelInit; 573 mSelStart = mSelInit;
570 574
571 //repaint only if selection has changed 575 //repaint only if selection has changed
572 if (tmp != mSelEnd) { 576 if (tmp != mSelEnd) {
573 mSelEnd = tmp; 577 mSelEnd = tmp;
574 repaint(false); 578 repaint(false);
575 } 579 }
576 } 580 }
577} 581}
578 582
579// ---------------------------------------------------------------------------- 583// ----------------------------------------------------------------------------
580// D R A G ' N D R O P H A N D L I N G 584// D R A G ' N D R O P H A N D L I N G
581// ---------------------------------------------------------------------------- 585// ----------------------------------------------------------------------------
582 586
583void KODayMatrix::dragEnterEvent(QDragEnterEvent *e) 587void KODayMatrix::dragEnterEvent(QDragEnterEvent *e)
584{ 588{
585#ifndef KORG_NODND 589#ifndef KORG_NODND
586 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) { 590 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
587 e->ignore(); 591 e->ignore();
588 return; 592 return;
589 } 593 }
590 594
591 // some visual feedback 595 // some visual feedback
592// oldPalette = palette(); 596// oldPalette = palette();
593// setPalette(my_HilitePalette); 597// setPalette(my_HilitePalette);
594// update(); 598// update();
595#endif 599#endif
596} 600}
597 601
598void KODayMatrix::dragMoveEvent(QDragMoveEvent *e) 602void KODayMatrix::dragMoveEvent(QDragMoveEvent *e)
599{ 603{
600#ifndef KORG_NODND 604#ifndef KORG_NODND
601 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) { 605 if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
602 e->ignore(); 606 e->ignore();
603 return; 607 return;
604 } 608 }
605 609
606 e->accept(); 610 e->accept();
607#endif 611#endif
608} 612}
609 613
610void KODayMatrix::dragLeaveEvent(QDragLeaveEvent */*dl*/) 614void KODayMatrix::dragLeaveEvent(QDragLeaveEvent */*dl*/)
611{ 615{
612#ifndef KORG_NODND 616#ifndef KORG_NODND
613// setPalette(oldPalette); 617// setPalette(oldPalette);
614// update(); 618// update();
615#endif 619#endif
616} 620}
617 621
618void KODayMatrix::dropEvent(QDropEvent *e) 622void KODayMatrix::dropEvent(QDropEvent *e)
619{ 623{
620#ifndef KORG_NODND 624#ifndef KORG_NODND
621// kdDebug() << "KODayMatrix::dropEvent(e) begin" << endl; 625// kdDebug() << "KODayMatrix::dropEvent(e) begin" << endl;
622 626
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 2fd13bd..802261c 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -26,130 +26,131 @@
26#include <qlayout.h> 26#include <qlayout.h>
27#include <qvbox.h> 27#include <qvbox.h>
28#include <qbuttongroup.h> 28#include <qbuttongroup.h>
29#include <qvgroupbox.h> 29#include <qvgroupbox.h>
30#include <qwidgetstack.h> 30#include <qwidgetstack.h>
31#include <qdatetime.h> 31#include <qdatetime.h>
32#include <qapp.h> 32#include <qapp.h>
33 33
34#include <klocale.h> 34#include <klocale.h>
35#include <kglobal.h> 35#include <kglobal.h>
36#include <kiconloader.h> 36#include <kiconloader.h>
37#include <kstandarddirs.h> 37#include <kstandarddirs.h>
38#include <kmessagebox.h> 38#include <kmessagebox.h>
39#ifndef KORG_NOKABC 39#ifndef KORG_NOKABC
40 40
41#ifdef DESKTOP_VERSION 41#ifdef DESKTOP_VERSION
42#include <kabc/addresseedialog.h> 42#include <kabc/addresseedialog.h>
43#else //DESKTOP_VERSION 43#else //DESKTOP_VERSION
44#include <externalapphandler.h> 44#include <externalapphandler.h>
45#endif //DESKTOP_VERSION 45#endif //DESKTOP_VERSION
46 46
47#endif 47#endif
48 48
49#include <libkcal/incidence.h> 49#include <libkcal/incidence.h>
50 50
51#include "koprefs.h" 51#include "koprefs.h"
52 52
53#include "koeditordetails.h" 53#include "koeditordetails.h"
54 54
55template <> 55template <>
56CustomListViewItem<class Attendee *>::~CustomListViewItem() 56CustomListViewItem<class Attendee *>::~CustomListViewItem()
57{ 57{
58 delete mData; 58 delete mData;
59} 59}
60 60
61template <> 61template <>
62void CustomListViewItem<class Attendee *>::updateItem() 62void CustomListViewItem<class Attendee *>::updateItem()
63{ 63{
64 setText(0,mData->name()); 64 setText(0,mData->name());
65 setText(1,mData->email()); 65 setText(1,mData->email());
66 setText(2,mData->roleStr()); 66 setText(2,mData->roleStr());
67 setText(3,mData->statusStr()); 67 setText(3,mData->statusStr());
68 if (mData->RSVP() && !mData->email().isEmpty()) 68 if (mData->RSVP() && !mData->email().isEmpty())
69 setPixmap(4,SmallIcon("mailappt")); 69 setPixmap(4,SmallIcon("mailappt"));
70 else 70 else
71 setPixmap(4,SmallIcon("nomailappt")); 71 setPixmap(4,SmallIcon("nomailappt"));
72} 72}
73 73
74 74
75KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) 75KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
76 : QWidget( parent, name), mDisableItemUpdate( false ) 76 : QWidget( parent, name), mDisableItemUpdate( false )
77{ 77{
78 QGridLayout *topLayout = new QGridLayout(this); 78 QGridLayout *topLayout = new QGridLayout(this);
79 topLayout->setSpacing(spacing); 79 topLayout->setSpacing(spacing);
80 80
81 QString organizer = KOPrefs::instance()->email(); 81 QString organizer = KOPrefs::instance()->email();
82 mOrganizerLabel = new QLabel(i18n("Organizer: %1").arg(organizer),this); 82 mOrganizerLabel = new QLabel(i18n("Organizer: %1").arg(organizer),this);
83 83
84 mListView = new KListView(this,"mListView"); 84 mListView = new KListView(this,"mListView");
85 mListView->addColumn(i18n("Name"),180); 85 mListView->addColumn(i18n("Name"),180);
86 mListView->addColumn(i18n("Email"),180); 86 mListView->addColumn(i18n("Email"),180);
87 mListView->addColumn(i18n("Role"),60); 87 mListView->addColumn(i18n("Role"),60);
88 mListView->addColumn(i18n("Status"),100); 88 mListView->addColumn(i18n("Status"),100);
89 mListView->addColumn(i18n("RSVP"),35); 89 mListView->addColumn(i18n("RSVP"),35);
90 if ( KOPrefs::instance()->mCompactDialogs ) { 90 if ( QApplication::desktop()->width() <= 320 ) {
91 //mListView->setFixedHeight(78); 91 //mListView->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding) );
92 mListView->setFixedHeight(80);
92 } 93 }
93 mListView->setAllColumnsShowFocus (true ); 94 mListView->setAllColumnsShowFocus (true );
94 //mListView->setSingleClick( true ); 95 //mListView->setSingleClick( true );
95 connect(mListView,SIGNAL(selectionChanged(QListViewItem *)), 96 connect(mListView,SIGNAL(selectionChanged(QListViewItem *)),
96 SLOT(updateAttendeeInput())); 97 SLOT(updateAttendeeInput()));
97 98
98 connect(mListView,SIGNAL(executed(QListViewItem * ,const QPoint&, int )), 99 connect(mListView,SIGNAL(executed(QListViewItem * ,const QPoint&, int )),
99 SLOT(itemClicked(QListViewItem * ,const QPoint& , int ))); 100 SLOT(itemClicked(QListViewItem * ,const QPoint& , int )));
100 101
101 mRsvpButton = new QCheckBox(this); 102 mRsvpButton = new QCheckBox(this);
102 mRsvpButton->setText(i18n("Request response")); 103 mRsvpButton->setText(i18n("Request response"));
103 mAddressBookButton = new QPushButton(i18n("Address &Book..."),this); 104 mAddressBookButton = new QPushButton(i18n("Address &Book..."),this);
104 QLabel *attendeeLabel = new QLabel(this); 105 QLabel *attendeeLabel = new QLabel(this);
105 attendeeLabel->setText(i18n("Name:")); 106 attendeeLabel->setText(i18n("Name:"));
106 attendeeLabel->setFixedSize( attendeeLabel->sizeHint() ); 107 attendeeLabel->setFixedSize( attendeeLabel->sizeHint() );
107 mNameEdit = new QLineEdit(this); 108 mNameEdit = new QLineEdit(this);
108 connect(mNameEdit,SIGNAL(textChanged(const QString &)), 109 connect(mNameEdit,SIGNAL(textChanged(const QString &)),
109 SLOT(updateAttendeeItem())); 110 SLOT(updateAttendeeItem()));
110 111
111 mUidEdit = new QLineEdit(0); 112 mUidEdit = new QLineEdit(0);
112 mUidEdit->setText(""); 113 mUidEdit->setText("");
113 114
114 QLabel *emailLabel = new QLabel(this); 115 QLabel *emailLabel = new QLabel(this);
115 emailLabel->setText(i18n("Email:")); 116 emailLabel->setText(i18n("Email:"));
116 mEmailEdit = new QLineEdit(this); 117 mEmailEdit = new QLineEdit(this);
117 connect(mEmailEdit,SIGNAL(textChanged(const QString &)), 118 connect(mEmailEdit,SIGNAL(textChanged(const QString &)),
118 SLOT(updateAttendeeItem())); 119 SLOT(updateAttendeeItem()));
119 120
120 QLabel *attendeeRoleLabel = new QLabel(this); 121 QLabel *attendeeRoleLabel = new QLabel(this);
121 attendeeRoleLabel->setText(i18n("Role:")); 122 attendeeRoleLabel->setText(i18n("Role:"));
122 mRoleCombo = new QComboBox(false,this); 123 mRoleCombo = new QComboBox(false,this);
123 mRoleCombo->insertStringList(Attendee::roleList()); 124 mRoleCombo->insertStringList(Attendee::roleList());
124 connect(mRoleCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem())); 125 connect(mRoleCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem()));
125 126
126 QLabel *statusLabel = new QLabel(this); 127 QLabel *statusLabel = new QLabel(this);
127 statusLabel->setText( i18n("Status:") ); 128 statusLabel->setText( i18n("Status:") );
128 129
129 mStatusCombo = new QComboBox(false,this); 130 mStatusCombo = new QComboBox(false,this);
130 mStatusCombo->insertStringList(Attendee::statusList()); 131 mStatusCombo->insertStringList(Attendee::statusList());
131 connect(mStatusCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem())); 132 connect(mStatusCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem()));
132 133
133 134
134 connect(mRsvpButton,SIGNAL(clicked()),SLOT(updateAttendeeItem())); 135 connect(mRsvpButton,SIGNAL(clicked()),SLOT(updateAttendeeItem()));
135 QWidget *buttonBox = new QWidget(this); 136 QWidget *buttonBox = new QWidget(this);
136 QVBoxLayout *buttonLayout = new QVBoxLayout(buttonBox); 137 QVBoxLayout *buttonLayout = new QVBoxLayout(buttonBox);
137 138
138 QPushButton *newButton = new QPushButton(i18n("&New"),buttonBox); 139 QPushButton *newButton = new QPushButton(i18n("&New"),buttonBox);
139 buttonLayout->addWidget(newButton); 140 buttonLayout->addWidget(newButton);
140 connect(newButton,SIGNAL(clicked()),SLOT(addNewAttendee())); 141 connect(newButton,SIGNAL(clicked()),SLOT(addNewAttendee()));
141 142
142 mRemoveButton = new QPushButton(i18n("&Remove"),buttonBox); 143 mRemoveButton = new QPushButton(i18n("&Remove"),buttonBox);
143 buttonLayout->addWidget(mRemoveButton); 144 buttonLayout->addWidget(mRemoveButton);
144 connect(mRemoveButton, SIGNAL(clicked()),SLOT(removeAttendee())); 145 connect(mRemoveButton, SIGNAL(clicked()),SLOT(removeAttendee()));
145 146
146 // buttonLayout->addWidget(mAddressBookButton); 147 // buttonLayout->addWidget(mAddressBookButton);
147 connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook())); 148 connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook()));
148 //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () ); 149 //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () );
149 150
150 if (qApp->desktop()->width() < 640 ) { 151 if (qApp->desktop()->width() < 640 ) {
151 if ( qApp->desktop()->width() < 300 ) 152 if ( qApp->desktop()->width() < 300 )
152 topLayout->setSpacing(1); 153 topLayout->setSpacing(1);
153 ;//mListView->setFixedHeight(80); 154 ;//mListView->setFixedHeight(80);
154 topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3); 155 topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3);
155 topLayout->addMultiCellWidget(mListView,1,1,0,3); 156 topLayout->addMultiCellWidget(mListView,1,1,0,3);
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 97ab4e8..5879a2d 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -109,140 +109,141 @@ KOPrefs::KOPrefs() :
109#ifndef DESKTOP_VERSION 109#ifndef DESKTOP_VERSION
110 addItemBool("ShowFullMenu",&mShowFullMenu,false); 110 addItemBool("ShowFullMenu",&mShowFullMenu,false);
111#else 111#else
112 addItemBool("ShowFullMenu",&mShowFullMenu,true); 112 addItemBool("ShowFullMenu",&mShowFullMenu,true);
113#endif 113#endif
114 addItemBool("ToolBarHor",&mToolBarHor, true ); 114 addItemBool("ToolBarHor",&mToolBarHor, true );
115 addItemBool("ToolBarUp",&mToolBarUp, false ); 115 addItemBool("ToolBarUp",&mToolBarUp, false );
116 addItemBool("ToolBarHorV",&mToolBarHorV, true ); 116 addItemBool("ToolBarHorV",&mToolBarHorV, true );
117 addItemBool("ToolBarUpV",&mToolBarUpV, false ); 117 addItemBool("ToolBarUpV",&mToolBarUpV, false );
118 addItemBool("ToolBarHorN",&mToolBarHorN, true ); 118 addItemBool("ToolBarHorN",&mToolBarHorN, true );
119 addItemBool("ToolBarUpN",&mToolBarUpN, false ); 119 addItemBool("ToolBarUpN",&mToolBarUpN, false );
120 addItemBool("ToolBarHorF",&mToolBarHorF, true ); 120 addItemBool("ToolBarHorF",&mToolBarHorF, true );
121 addItemBool("ToolBarUpF",&mToolBarUpF, false ); 121 addItemBool("ToolBarUpF",&mToolBarUpF, false );
122 addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false ); 122 addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
123 addItemInt("Whats Next Days",&mWhatsNextDays,3); 123 addItemInt("Whats Next Days",&mWhatsNextDays,3);
124 addItemInt("Whats Next Prios",&mWhatsNextPrios,1); 124 addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
125 125
126 addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true); 126 addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
127 addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true); 127 addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true);
128 addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false); 128 addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false);
129 addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true); 129 addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
130 addItemInt("AllDay Size",&mAllDaySize,28); 130 addItemInt("AllDay Size",&mAllDaySize,28);
131 QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav"; 131 QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
132 addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm ); 132 addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
133 133
134 addItemStringList("LocationDefaults",&mLocationDefaults ); 134 addItemStringList("LocationDefaults",&mLocationDefaults );
135 addItemStringList("EventSummary User",&mEventSummaryUser); 135 addItemStringList("EventSummary User",&mEventSummaryUser);
136 addItemStringList("TodoSummary User",&mTodoSummaryUser); 136 addItemStringList("TodoSummary User",&mTodoSummaryUser);
137 137
138 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); 138 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
139 addItemBool("Enable Project View",&mEnableProjectView,false); 139 addItemBool("Enable Project View",&mEnableProjectView,false);
140 addItemBool("Auto Save",&mAutoSave,false); 140 addItemBool("Auto Save",&mAutoSave,false);
141 addItemInt("Auto Save Interval",&mAutoSaveInterval,3); 141 addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
142 addItemBool("Confirm Deletes",&mConfirm,true); 142 addItemBool("Confirm Deletes",&mConfirm,true);
143 addItemString("Archive File",&mArchiveFile); 143 addItemString("Archive File",&mArchiveFile);
144 addItemString("Html Export File",&mHtmlExportFile, 144 addItemString("Html Export File",&mHtmlExportFile,
145 QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html")); 145 QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
146 addItemBool("Html With Save",&mHtmlWithSave,false); 146 addItemBool("Html With Save",&mHtmlWithSave,false);
147 147
148 KPrefs::setCurrentGroup("Personal Settings"); 148 KPrefs::setCurrentGroup("Personal Settings");
149 149
150 addItemInt("Mail Client",&mMailClient,MailClientKMail); 150 addItemInt("Mail Client",&mMailClient,MailClientKMail);
151 addItemBool("Use Control Center Email",&mEmailControlCenter,false); 151 addItemBool("Use Control Center Email",&mEmailControlCenter,false);
152 addItemBool("Bcc",&mBcc,false); 152 addItemBool("Bcc",&mBcc,false);
153 153
154 KPrefs::setCurrentGroup("Time & Date"); 154 KPrefs::setCurrentGroup("Time & Date");
155 155
156 156
157 addItemInt("Default Start Time",&mStartTime,10); 157 addItemInt("Default Start Time",&mStartTime,10);
158 addItemInt("Default Duration",&mDefaultDuration,2); 158 addItemInt("Default Duration",&mDefaultDuration,2);
159 addItemInt("Default Alarm Time",&mAlarmTime,3); 159 addItemInt("Default Alarm Time",&mAlarmTime,3);
160 KPrefs::setCurrentGroup("AlarmSettings"); 160 KPrefs::setCurrentGroup("AlarmSettings");
161 addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20); 161 addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
162 addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7); 162 addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
163 addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5); 163 addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
164 addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3); 164 addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
165 165
166 166
167 KPrefs::setCurrentGroup("Calendar"); 167 KPrefs::setCurrentGroup("Calendar");
168 168
169 addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar); 169 addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
170 170
171 KPrefs::setCurrentGroup("Fonts"); 171 KPrefs::setCurrentGroup("Fonts");
172 // qDebug(" KPrefs::setCurrentGroup(Fonts); "); 172 // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
173 addItemFont("TimeBar Font",&mTimeBarFont,KGlobalSettings::generalFont() ); 173 QFont fon = KGlobalSettings::generalFont();
174 addItemFont("MonthView Font",&mMonthViewFont,KGlobalSettings::generalFont()); 174 addItemFont("TimeBar Font",&mTimeBarFont,fon );
175 addItemFont("AgendaView Font",&mAgendaViewFont,KGlobalSettings::generalFont()); 175 addItemFont("MonthView Font",&mMonthViewFont,fon);
176 addItemFont("MarcusBains Font",&mMarcusBainsFont,KGlobalSettings::generalFont()); 176 addItemFont("AgendaView Font",&mAgendaViewFont,fon);
177 addItemFont("TimeLabels Font",&mTimeLabelsFont,KGlobalSettings::generalFont()); 177 addItemFont("MarcusBains Font",&mMarcusBainsFont,fon);
178 addItemFont("TodoView Font",&mTodoViewFont,KGlobalSettings::generalFont()); 178 addItemFont("TimeLabels Font",&mTimeLabelsFont,fon);
179 addItemFont("ListView Font",&mListViewFont,KGlobalSettings::generalFont()); 179 addItemFont("TodoView Font",&mTodoViewFont,fon);
180 addItemFont("DateNavigator Font",&mDateNavigatorFont,KGlobalSettings::generalFont()); 180 addItemFont("ListView Font",&mListViewFont,fon);
181 addItemFont("EditBox Font",&mEditBoxFont,KGlobalSettings::generalFont()); 181 addItemFont("DateNavigator Font",&mDateNavigatorFont,fon);
182 addItemFont("JournalView Font",&mJornalViewFont,KGlobalSettings::generalFont()); 182 addItemFont("EditBox Font",&mEditBoxFont,fon);
183 addItemFont("WhatsNextView Font",&mWhatsNextFont,KGlobalSettings::generalFont()); 183 addItemFont("JournalView Font",&mJornalViewFont,fon);
184 addItemFont("EventView Font",&mEventViewFont,KGlobalSettings::generalFont()); 184 addItemFont("WhatsNextView Font",&mWhatsNextFont,fon);
185 addItemFont("EventView Font",&mEventViewFont,fon);
185 186
186 KPrefs::setCurrentGroup("RemoteSyncing"); 187 KPrefs::setCurrentGroup("RemoteSyncing");
187 addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" ); 188 addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );
188 addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 189 addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" );
189 addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 190 addItemBool("ShowSyncEvents",&mShowSyncEvents,false);
190 addItemInt("LastSyncTime",&mLastSyncTime,0); 191 addItemInt("LastSyncTime",&mLastSyncTime,0);
191 192
192#ifdef _WIN32_ 193#ifdef _WIN32_
193 QString hdp= locateLocal("data","korganizer")+"\\\\"; 194 QString hdp= locateLocal("data","korganizer")+"\\\\";
194#else 195#else
195 QString hdp= locateLocal("data","korganizer")+"/"; 196 QString hdp= locateLocal("data","korganizer")+"/";
196#endif 197#endif
197 198
198 KPrefs::setCurrentGroup("LoadSaveFileNames"); 199 KPrefs::setCurrentGroup("LoadSaveFileNames");
199 200
200 addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" ); 201 addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
201 addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" ); 202 addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
202 addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" ); 203 addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
203 addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" ); 204 addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
204 205
205 206
206 KPrefs::setCurrentGroup("Locale"); 207 KPrefs::setCurrentGroup("Locale");
207 addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 208 addItemBool("ShortDateInViewer",&mShortDateInViewer,false);
208 209
209 210
210 KPrefs::setCurrentGroup("Colors"); 211 KPrefs::setCurrentGroup("Colors");
211 addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor); 212 addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
212 addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor); 213 addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
213 addItemColor("Event Color",&mEventColor,mDefaultCategoryColor); 214 addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
214 addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) ); 215 addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) );
215 addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor); 216 addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
216 addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor); 217 addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
217 addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor); 218 addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
218 addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor); 219 addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
219 addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 )); 220 addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
220 addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 )); 221 addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
221 addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 )); 222 addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
222 addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 223 addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true);
223 addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true); 224 addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
224 addItemBool("MonthViewWeek",&mMonthViewWeek,false); 225 addItemBool("MonthViewWeek",&mMonthViewWeek,false);
225 addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 226 addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false);
226 addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 )); 227 addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
227 addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 )); 228 addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 ));
228 addItemBool("UseAppColors",&mUseAppColors,false); 229 addItemBool("UseAppColors",&mUseAppColors,false);
229 230
230 231
231 232
232 KPrefs::setCurrentGroup("Views"); 233 KPrefs::setCurrentGroup("Views");
233 addItemBool("Show Date Navigator",&mShowDateNavigator,true); 234 addItemBool("Show Date Navigator",&mShowDateNavigator,true);
234 addItemInt("Hour Size",&mHourSize,8); 235 addItemInt("Hour Size",&mHourSize,8);
235 addItemBool("Show Daily Recurrences",&mDailyRecur,true); 236 addItemBool("Show Daily Recurrences",&mDailyRecur,true);
236 addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); 237 addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
237 addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); 238 addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
238 addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); 239 addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
239 addItemBool("ShowShortMonthName",&mMonthShowShort,false); 240 addItemBool("ShowShortMonthName",&mMonthShowShort,false);
240 addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); 241 addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
241#ifdef DESKTOP_VERION 242#ifdef DESKTOP_VERION
242 addItemBool("Enable ToolTips",&mEnableToolTips,true); 243 addItemBool("Enable ToolTips",&mEnableToolTips,true);
243#else 244#else
244 addItemBool("Enable ToolTips",&mEnableToolTips,false); 245 addItemBool("Enable ToolTips",&mEnableToolTips,false);
245#endif 246#endif
246 addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); 247 addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
247 addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); 248 addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
248 addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true); 249 addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 74037e6..8439b81 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -1,1031 +1,1037 @@
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 23
24#include <qlayout.h> 24#include <qlayout.h>
25#include <qlabel.h> 25#include <qlabel.h>
26#include <qgroupbox.h> 26#include <qgroupbox.h>
27#include <qbuttongroup.h> 27#include <qbuttongroup.h>
28#include <qlineedit.h> 28#include <qlineedit.h>
29#include <qfont.h> 29#include <qfont.h>
30#include <qslider.h> 30#include <qslider.h>
31#include <qfile.h> 31#include <qfile.h>
32#include <qtextstream.h> 32#include <qtextstream.h>
33#include <qcombobox.h> 33#include <qcombobox.h>
34#include <qvbox.h> 34#include <qvbox.h>
35#include <qhbox.h> 35#include <qhbox.h>
36#include <qregexp.h> 36#include <qregexp.h>
37#include <qspinbox.h> 37#include <qspinbox.h>
38#include <qdatetime.h> 38#include <qdatetime.h>
39#include <qcheckbox.h> 39#include <qcheckbox.h>
40#include <qradiobutton.h> 40#include <qradiobutton.h>
41#include <qpushbutton.h> 41#include <qpushbutton.h>
42#include <qstrlist.h> 42#include <qstrlist.h>
43#include <qapplication.h> 43#include <qapplication.h>
44 44
45#include <kcolorbutton.h> 45#include <kcolorbutton.h>
46#include <kdebug.h> 46#include <kdebug.h>
47#include <klocale.h> 47#include <klocale.h>
48#include <kglobal.h> 48#include <kglobal.h>
49#include <kfontdialog.h> 49#include <kfontdialog.h>
50#include <kfiledialog.h> 50#include <kfiledialog.h>
51#include <kmessagebox.h> 51#include <kmessagebox.h>
52#include <kcolordialog.h> 52#include <kcolordialog.h>
53#include <kiconloader.h> 53#include <kiconloader.h>
54#include <kemailsettings.h> 54#include <kemailsettings.h>
55#include <kstandarddirs.h> 55#include <kstandarddirs.h>
56#include <kglobalsettings.h>
56 57
57#include <kurlrequester.h> 58#include <kurlrequester.h>
58#include <klineedit.h> 59#include <klineedit.h>
59 60
60#if defined(USE_SOLARIS) 61#if defined(USE_SOLARIS)
61#include <sys/param.h> 62#include <sys/param.h>
62 63
63#define ZONEINFODIR "/usr/share/lib/zoneinfo" 64#define ZONEINFODIR "/usr/share/lib/zoneinfo"
64#define INITFILE "/etc/default/init" 65#define INITFILE "/etc/default/init"
65#endif 66#endif
66 67
67#include "koprefs.h" 68#include "koprefs.h"
68 69
69#include "koprefsdialog.h" 70#include "koprefsdialog.h"
70#include "kpimglobalprefs.h" 71#include "kpimglobalprefs.h"
71 72
72 73
73KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : 74KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
74 KPrefsDialog(KOPrefs::instance(),parent,name,true) 75 KPrefsDialog(KOPrefs::instance(),parent,name,true)
75{ 76{
76 77
78 setFont( KGlobalSettings::generalFont() );
77 setCaption( i18n("Preferences - some settings need a restart (nr)")); 79 setCaption( i18n("Preferences - some settings need a restart (nr)"));
78 mCategoryDict.setAutoDelete(true); 80 mCategoryDict.setAutoDelete(true);
79 81
80 KGlobal::locale()->insertCatalogue("timezones"); 82 KGlobal::locale()->insertCatalogue("timezones");
83 mSpacingHint = spacingHintSmall();
84 mMarginHint = marginHintSmall();
85#ifndef DESKTOP_VERSION
86 if ( QApplication::desktop()->height() == 480 )
87 hideButtons();
88#endif
81 89
82 setupGlobalTab(); 90 setupGlobalTab();
83 setupMainTab(); 91 setupMainTab();
84 // setupLocaleTab(); 92 // setupLocaleTab();
85 //setupTimeZoneTab(); 93 //setupTimeZoneTab();
86 setupTimeTab(); 94 setupTimeTab();
87 //setupLocaleDateTab(); 95 //setupLocaleDateTab();
88 setupFontsTab(); 96 setupFontsTab();
89 setupColorsTab(); 97 setupColorsTab();
90 setupViewsTab(); 98 setupViewsTab();
91 //setupSyncTab(); 99 //setupSyncTab();
92 //setupSyncAlgTab(); 100 //setupSyncAlgTab();
93 //setupPrinterTab(); 101 //setupPrinterTab();
94 //setupGroupSchedulingTab(); 102 //setupGroupSchedulingTab();
95 //setupGroupAutomationTab(); 103 //setupGroupAutomationTab();
96 104
97#ifndef DESKTOP_VERSION 105
98 if ( QApplication::desktop()->height() == 480 )
99 hideButtons();
100#endif
101} 106}
102 107
103 108
104KOPrefsDialog::~KOPrefsDialog() 109KOPrefsDialog::~KOPrefsDialog()
105{ 110{
106} 111}
107void KOPrefsDialog::setupGlobalTab() 112void KOPrefsDialog::setupGlobalTab()
108{ 113{
109 QFrame *topFrame = addPage(i18n("Global"),0,0); 114 QFrame *topFrame = addPage(i18n("Global"),0,0);
110 kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); 115 kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
111 QVBoxLayout *topLayout = new QVBoxLayout(topFrame); 116 QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
112 topLayout->addWidget( kdelibcfg ); 117 topLayout->addWidget( kdelibcfg );
113 118
114 119
115} 120}
116void KOPrefsDialog::setupLocaleDateTab() 121void KOPrefsDialog::setupLocaleDateTab()
117{ 122{
118#if 0 123#if 0
119QFrame *topFrame = addPage(i18n("Date Format"),0,0); 124QFrame *topFrame = addPage(i18n("Date Format"),0,0);
120 QGridLayout *topLayout = new QGridLayout(topFrame,3,2); 125 QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
121 topLayout->setSpacing(spacingHint()); 126 topLayout->setSpacing(mSpacingHint);
122 topLayout->setMargin(marginHint()); 127 topLayout->setMargin(mMarginHint);
123 int iii = 0; 128 int iii = 0;
124 129
125 130
126 KPrefsDialogWidRadios *syncPrefsGroup = 131 KPrefsDialogWidRadios *syncPrefsGroup =
127 addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); 132 addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
128 QString format; 133 QString format;
129 if ( QApplication::desktop()->width() < 480 ) 134 if ( QApplication::desktop()->width() < 480 )
130 format = "(%d.%m.%Y)"; 135 format = "(%d.%m.%Y)";
131 else 136 else
132 format = "(%d.%m.%Y|%A %d %B %Y)"; 137 format = "(%d.%m.%Y|%A %d %B %Y)";
133 syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); 138 syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
134 if ( QApplication::desktop()->width() < 480 ) 139 if ( QApplication::desktop()->width() < 480 )
135 format = "(%m.%d.%Y)"; 140 format = "(%m.%d.%Y)";
136 else 141 else
137 format = "(%m.%d.%Y|%A %B %d %Y)"; 142 format = "(%m.%d.%Y|%A %B %d %Y)";
138 syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); 143 syncPrefsGroup->addRadio(i18n("03.24.2004 "+format));
139 if ( QApplication::desktop()->width() < 480 ) 144 if ( QApplication::desktop()->width() < 480 )
140 format = "(%Y-%m-%d)"; 145 format = "(%Y-%m-%d)";
141 else 146 else
142 format = "(%Y-%m-%d|%A %Y %B %d)"; 147 format = "(%Y-%m-%d|%A %Y %B %d)";
143 syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); 148 syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
144 syncPrefsGroup->addRadio(i18n("User defined")); 149 syncPrefsGroup->addRadio(i18n("User defined"));
145 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 150 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
146 ++iii; 151 ++iii;
147 ++iii; 152 ++iii;
148 QLabel * lab; 153 QLabel * lab;
149 mUserDateFormatLong = new QLineEdit(topFrame); 154 mUserDateFormatLong = new QLineEdit(topFrame);
150 lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); 155 lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame);
151 topLayout->addWidget(lab ,iii,0); 156 topLayout->addWidget(lab ,iii,0);
152 topLayout->addWidget(mUserDateFormatLong,iii,1); 157 topLayout->addWidget(mUserDateFormatLong,iii,1);
153 ++iii; 158 ++iii;
154 mUserDateFormatShort = new QLineEdit(topFrame); 159 mUserDateFormatShort = new QLineEdit(topFrame);
155 lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); 160 lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame);
156 topLayout->addWidget(lab ,iii,0); 161 topLayout->addWidget(lab ,iii,0);
157 topLayout->addWidget(mUserDateFormatShort,iii,1); 162 topLayout->addWidget(mUserDateFormatShort,iii,1);
158 ++iii; 163 ++iii;
159 lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); 164 lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
160 topLayout->addMultiCellWidget(lab ,iii,iii,0,1); 165 topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
161 ++iii; 166 ++iii;
162 lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); 167 lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
163 topLayout->addMultiCellWidget(lab ,iii,iii,0,1); 168 topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
164 ++iii; 169 ++iii;
165 lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); 170 lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
166 topLayout->addMultiCellWidget(lab ,iii,iii,0,1); 171 topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
167 ++iii; 172 ++iii;
168#endif 173#endif
169 174
170} 175}
171 176
172void KOPrefsDialog::setupLocaleTab() 177void KOPrefsDialog::setupLocaleTab()
173{ 178{
174#if 0 179#if 0
175 QFrame *topFrame = addPage(i18n("Locale"),0,0); 180 QFrame *topFrame = addPage(i18n("Locale"),0,0);
176 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 181 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
177 topLayout->setSpacing(spacingHint()); 182 topLayout->setSpacing(mSpacingHint);
178 topLayout->setMargin(marginHint()); 183 topLayout->setMargin(mMarginHint);
179 int iii = 0; 184 int iii = 0;
180 KPrefsDialogWidRadios *syncPrefsGroup = 185 KPrefsDialogWidRadios *syncPrefsGroup =
181 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); 186 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
182 syncPrefsGroup->addRadio(i18n("English")); 187 syncPrefsGroup->addRadio(i18n("English"));
183 syncPrefsGroup->addRadio(i18n("German")); 188 syncPrefsGroup->addRadio(i18n("German"));
184 syncPrefsGroup->addRadio(i18n("French")); 189 syncPrefsGroup->addRadio(i18n("French"));
185 syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 190 syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)"));
186 if ( QApplication::desktop()->width() < 300 ) 191 if ( QApplication::desktop()->width() < 300 )
187 ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 192 ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
188 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 193 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
189 ++iii; 194 ++iii;
190 195
191 syncPrefsGroup = 196 syncPrefsGroup =
192 addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame); 197 addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame);
193 if ( QApplication::desktop()->width() > 300 ) 198 if ( QApplication::desktop()->width() > 300 )
194 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 199 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
195 syncPrefsGroup->addRadio(i18n("24:00")); 200 syncPrefsGroup->addRadio(i18n("24:00"));
196 syncPrefsGroup->addRadio(i18n("12:00am")); 201 syncPrefsGroup->addRadio(i18n("12:00am"));
197 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 202 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
198 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 203 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
199 ++iii; 204 ++iii;
200 KPrefsDialogWidBool *sb; 205 KPrefsDialogWidBool *sb;
201 if ( QApplication::desktop()->width() < 300 ) { 206 if ( QApplication::desktop()->width() < 300 ) {
202 sb = 207 sb =
203 addWidBool(i18n("Week starts on Sunday"), 208 addWidBool(i18n("Week starts on Sunday"),
204 &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame); 209 &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame);
205 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 210 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
206 ++iii; 211 ++iii;
207 sb = 212 sb =
208 addWidBool(i18n("Use short date in (WN/E) view"), 213 addWidBool(i18n("Use short date in (WN/E) view"),
209 &(KOPrefs::instance()->mShortDateInViewer),topFrame); 214 &(KOPrefs::instance()->mShortDateInViewer),topFrame);
210 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 215 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
211 } 216 }
212 else { 217 else {
213 QWidget * hb = new QWidget( topFrame ); 218 QWidget * hb = new QWidget( topFrame );
214 QHBoxLayout *hbLayout = new QHBoxLayout(hb); 219 QHBoxLayout *hbLayout = new QHBoxLayout(hb);
215 sb = 220 sb =
216 addWidBool(i18n("Week starts on Sunday"), 221 addWidBool(i18n("Week starts on Sunday"),
217 &(KOPrefs::instance()->mWeekStartsOnSunday),hb); 222 &(KOPrefs::instance()->mWeekStartsOnSunday),hb);
218 hbLayout->addWidget(sb->checkBox() ); 223 hbLayout->addWidget(sb->checkBox() );
219 sb = 224 sb =
220 addWidBool(i18n("Use short date in (WN/E) view"), 225 addWidBool(i18n("Use short date in (WN/E) view"),
221 &(KOPrefs::instance()->mShortDateInViewer),hb); 226 &(KOPrefs::instance()->mShortDateInViewer),hb);
222 hbLayout->addWidget(sb->checkBox() ); 227 hbLayout->addWidget(sb->checkBox() );
223 topLayout->addMultiCellWidget(hb, iii,iii,0,1); 228 topLayout->addMultiCellWidget(hb, iii,iii,0,1);
224 229
225 } 230 }
226 // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION 231 // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION
227#if 0 232#if 0
228 ++iii; 233 ++iii;
229 sb = 234 sb =
230 addWidBool(i18n("Quick load/save (w/o Unicode)"), 235 addWidBool(i18n("Quick load/save (w/o Unicode)"),
231 &(KOPrefs::instance()->mUseQuicksave),topFrame); 236 &(KOPrefs::instance()->mUseQuicksave),topFrame);
232 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 237 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
233#endif 238#endif
234#endif 239#endif
235} 240}
236void KOPrefsDialog::showSyncPage() 241void KOPrefsDialog::showSyncPage()
237{ 242{
238 showPage ( 0 ) ; 243 showPage ( 0 ) ;
239 kdelibcfg->showTimeZoneTab() ; 244 kdelibcfg->showTimeZoneTab() ;
240 245
241} 246}
242void KOPrefsDialog::setupSyncAlgTab() 247void KOPrefsDialog::setupSyncAlgTab()
243{ 248{
244#if 0 249#if 0
245 QLabel * lab; 250 QLabel * lab;
246 QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); 251 QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
247 mSetupSyncAlgTab = topFrame; 252 mSetupSyncAlgTab = topFrame;
248 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 253 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
249 topLayout->setSpacing(spacingHint()); 254 topLayout->setSpacing(mSpacingHint);
250 topLayout->setMargin(marginHint()); 255 topLayout->setMargin(mMarginHint);
251 int iii = 0; 256 int iii = 0;
252 257
253 KPrefsDialogWidBool *sb = 258 KPrefsDialogWidBool *sb =
254 addWidBool(i18n("Ask for preferences before syncing"), 259 addWidBool(i18n("Ask for preferences before syncing"),
255 &(KOPrefs::instance()->mAskForPreferences),topFrame); 260 &(KOPrefs::instance()->mAskForPreferences),topFrame);
256 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 261 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
257 262
258 ++iii; 263 ++iii;
259 264
260 KPrefsDialogWidRadios *syncPrefsGroup = 265 KPrefsDialogWidRadios *syncPrefsGroup =
261 addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs), 266 addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
262 topFrame); 267 topFrame);
263 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); 268 syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
264 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); 269 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict"));
265 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); 270 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict"));
266 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); 271 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict"));
267 syncPrefsGroup->addRadio(i18n("Force take local entry always")); 272 syncPrefsGroup->addRadio(i18n("Force take local entry always"));
268 syncPrefsGroup->addRadio(i18n("Force take remote entry always")); 273 syncPrefsGroup->addRadio(i18n("Force take remote entry always"));
269 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 274 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
270 ++iii; 275 ++iii;
271 sb = 276 sb =
272 addWidBool(i18n("Show summary after syncing"), 277 addWidBool(i18n("Show summary after syncing"),
273 &(KOPrefs::instance()->mShowSyncSummary),topFrame); 278 &(KOPrefs::instance()->mShowSyncSummary),topFrame);
274 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 279 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
275 280
276 ++iii; 281 ++iii;
277#endif 282#endif
278 283
279 284
280 285
281} 286}
282 287
283 288
284void KOPrefsDialog::setupSyncTab() 289void KOPrefsDialog::setupSyncTab()
285{ 290{
286#if 0 291#if 0
287 QLabel * lab; 292 QLabel * lab;
288 QFrame *topFrame = addPage(i18n("Sync Network"),0,0); 293 QFrame *topFrame = addPage(i18n("Sync Network"),0,0);
289 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 294 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
290 topLayout->setSpacing(spacingHint()); 295 topLayout->setSpacing(mSpacingHint);
291 topLayout->setMargin(marginHint()); 296 topLayout->setMargin(mMarginHint);
292 lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame); 297 lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame);
293 int iii = 0; 298 int iii = 0;
294 topLayout->addMultiCellWidget(lab , iii,iii,0,1); 299 topLayout->addMultiCellWidget(lab , iii,iii,0,1);
295 ++iii; 300 ++iii;
296 301
297 mRemoteIPEdit = new QLineEdit(topFrame); 302 mRemoteIPEdit = new QLineEdit(topFrame);
298 lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame); 303 lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame);
299 topLayout->addWidget(lab ,iii,0); 304 topLayout->addWidget(lab ,iii,0);
300 topLayout->addWidget(mRemoteIPEdit,iii,1); 305 topLayout->addWidget(mRemoteIPEdit,iii,1);
301 ++iii; 306 ++iii;
302 mRemoteUser = new QLineEdit(topFrame); 307 mRemoteUser = new QLineEdit(topFrame);
303 lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame); 308 lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame);
304 topLayout->addWidget(lab ,iii,0); 309 topLayout->addWidget(lab ,iii,0);
305 topLayout->addWidget(mRemoteUser, iii,1); 310 topLayout->addWidget(mRemoteUser, iii,1);
306 ++iii; 311 ++iii;
307 312
308 mRemoteFile = new QLineEdit(topFrame); 313 mRemoteFile = new QLineEdit(topFrame);
309 lab = new QLabel(mRemoteFile, i18n("Remote file:"), topFrame); 314 lab = new QLabel(mRemoteFile, i18n("Remote file:"), topFrame);
310 topLayout->addWidget(lab ,iii,0); 315 topLayout->addWidget(lab ,iii,0);
311 topLayout->addWidget(mRemoteFile,iii,1); 316 topLayout->addWidget(mRemoteFile,iii,1);
312 ++iii; 317 ++iii;
313 318
314 mLocalTempFile = new QLineEdit(topFrame); 319 mLocalTempFile = new QLineEdit(topFrame);
315 lab = new QLabel(mLocalTempFile, i18n("Local temp file:"), topFrame); 320 lab = new QLabel(mLocalTempFile, i18n("Local temp file:"), topFrame);
316 topLayout->addWidget(lab ,iii,0); 321 topLayout->addWidget(lab ,iii,0);
317 topLayout->addWidget(mLocalTempFile,iii,1); 322 topLayout->addWidget(mLocalTempFile,iii,1);
318 ++iii; 323 ++iii;
319 324
320 KPrefsDialogWidBool *wb = 325 KPrefsDialogWidBool *wb =
321 addWidBool(i18n("Write back synced file"), 326 addWidBool(i18n("Write back synced file"),
322 &(KOPrefs::instance()->mWriteBackFile),topFrame); 327 &(KOPrefs::instance()->mWriteBackFile),topFrame);
323 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1); 328 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
324 ++iii; 329 ++iii;
325 wb = 330 wb =
326 addWidBool(i18n("Write back existing entries only"), 331 addWidBool(i18n("Write back existing entries only"),
327 &(KOPrefs::instance()->mWriteBackExistingOnly),topFrame); 332 &(KOPrefs::instance()->mWriteBackExistingOnly),topFrame);
328 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1); 333 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
329 ++iii; 334 ++iii;
330 335
331#endif 336#endif
332} 337}
333 338
334void KOPrefsDialog::setupMainTab() 339void KOPrefsDialog::setupMainTab()
335{ 340{
336 QFrame *topFrame = addPage(i18n("General"),0,0); 341 QFrame *topFrame = addPage(i18n("General"),0,0);
337 // DesktopIcon("identity",KIcon::SizeMedium)); 342 // DesktopIcon("identity",KIcon::SizeMedium));
338 343
339 QGridLayout *topLayout = new QGridLayout(topFrame,5,2); 344 QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
340 topLayout->setSpacing(spacingHint()); 345 topLayout->setSpacing(mSpacingHint);
341 topLayout->setMargin(marginHint()); 346 topLayout->setMargin(mMarginHint);
342 347
343 // KPrefsDialogWidBool *emailControlCenter = 348 // KPrefsDialogWidBool *emailControlCenter =
344// addWidBool(i18n("&Use email settings from Control Center"), 349// addWidBool(i18n("&Use email settings from Control Center"),
345// &(KOPrefs::instance()->mEmailControlCenter),topFrame); 350// &(KOPrefs::instance()->mEmailControlCenter),topFrame);
346// topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1); 351// topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1);
347 // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)), 352 // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)),
348 // SLOT(toggleEmailSettings(bool))); 353 // SLOT(toggleEmailSettings(bool)));
349 354
350 mNameEdit = new QLineEdit(topFrame); 355 mNameEdit = new QLineEdit(topFrame);
351 mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); 356 mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
352 topLayout->addWidget(mNameLabel,0,0); 357 topLayout->addWidget(mNameLabel,0,0);
353 topLayout->addWidget(mNameEdit,0,1); 358 topLayout->addWidget(mNameEdit,0,1);
354 359
355 mEmailEdit = new QLineEdit(topFrame); 360 mEmailEdit = new QLineEdit(topFrame);
356 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); 361 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
357 topLayout->addWidget(mEmailLabel,1,0); 362 topLayout->addWidget(mEmailLabel,1,0);
358 topLayout->addWidget(mEmailEdit,1,1); 363 topLayout->addWidget(mEmailEdit,1,1);
359 KPrefsDialogWidBool *wb; 364 KPrefsDialogWidBool *wb;
360 365
361 366
362 367
363 KPrefsDialogWidBool *widbool = addWidBool(i18n("Full menu bar(nr)"), 368 KPrefsDialogWidBool *widbool = addWidBool(i18n("Full menu bar(nr)"),
364 &(KOPrefs::instance()->mShowFullMenu),topFrame); 369 &(KOPrefs::instance()->mShowFullMenu),topFrame);
365 topLayout->addMultiCellWidget( widbool->checkBox(), 2,2,0,1); 370 topLayout->addMultiCellWidget( widbool->checkBox(), 2,2,0,1);
366 371
367 372
368 widbool = addWidBool(i18n("Mini icons in toolbar(nr)"), 373 widbool = addWidBool(i18n("Mini icons in toolbar(nr)"),
369 &(KOPrefs::instance()->mToolBarMiniIcons),topFrame); 374 &(KOPrefs::instance()->mToolBarMiniIcons),topFrame);
370 topLayout->addMultiCellWidget( widbool->checkBox(), 3,3,0,1); 375 topLayout->addMultiCellWidget( widbool->checkBox(), 3,3,0,1);
371 376
372 377
373 KPrefsDialogWidBool *verticalScreen = 378 KPrefsDialogWidBool *verticalScreen =
374 addWidBool(i18n("Show vertical screen (Needs restart)"), 379 addWidBool(i18n("Show vertical screen (Needs restart)"),
375 &(KOPrefs::instance()->mVerticalScreen),topFrame); 380 &(KOPrefs::instance()->mVerticalScreen),topFrame);
376 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0); 381 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
377 topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1); 382 topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1);
378 383
379 384
380 QHBox *dummy = new QHBox(topFrame); 385 QHBox *dummy = new QHBox(topFrame);
381 new QLabel(i18n("Days in Next-X-Days:"),dummy); 386 new QLabel(i18n("Days in Next-X-Days:"),dummy);
382 mNextXDaysSpin = new QSpinBox(2,14,1,dummy); 387 mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
383 388
384 topLayout->addMultiCellWidget(dummy,5,5,0,1); 389 topLayout->addMultiCellWidget(dummy,5,5,0,1);
385 390
386 391
387 392
388 // KPrefsDialogWidBool *bcc = 393 // KPrefsDialogWidBool *bcc =
389// addWidBool(i18n("Send copy to owner when mailing events"), 394// addWidBool(i18n("Send copy to owner when mailing events"),
390// &(KOPrefs::instance()->mBcc),topFrame); 395// &(KOPrefs::instance()->mBcc),topFrame);
391// topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1); 396// topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1);
392 397
393 398
394 // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"), topFrame); 399 // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"), topFrame);
395 //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1); 400 //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1);
396 401
397 // addWidBool(i18n("Enable automatic saving of calendar"), 402 // addWidBool(i18n("Enable automatic saving of calendar"),
398 // &(KOPrefs::instance()->mAutoSave),autoSaveGroup); 403 // &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
399 404
400 QHBox *intervalBox = new QHBox(topFrame); 405 QHBox *intervalBox = new QHBox(topFrame);
401 // intervalBox->setSpacing(spacingHint()); 406 // intervalBox->setSpacing(mSpacingHint);
402 topLayout->addMultiCellWidget(intervalBox,6,6,0,1); 407 topLayout->addMultiCellWidget(intervalBox,6,6,0,1);
403 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox); 408 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
404 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox); 409 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
405 autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); 410 autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin);
406 /* 411 /*
407 QHBox * agendasize = new QHBox ( topFrame ); 412 QHBox * agendasize = new QHBox ( topFrame );
408 413
409 new QLabel (i18n("AllDayAgenda Height:"), agendasize ); 414 new QLabel (i18n("AllDayAgenda Height:"), agendasize );
410 415
411 416
412 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize); 417 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize);
413 topLayout->addMultiCellWidget(agendasize,7,7,0,1); 418 topLayout->addMultiCellWidget(agendasize,7,7,0,1);
414 */ 419 */
415 420
416 421
417 KPrefsDialogWidBool *ask = 422 KPrefsDialogWidBool *ask =
418 addWidBool(i18n("Ask for quit when closing KO/Pi"), 423 addWidBool(i18n("Ask for quit when closing KO/Pi"),
419 &(KOPrefs::instance()->mAskForQuit),topFrame); 424 &(KOPrefs::instance()->mAskForQuit),topFrame);
420 topLayout->addMultiCellWidget(ask->checkBox(),7,7,0,1); 425 topLayout->addMultiCellWidget(ask->checkBox(),7,7,0,1);
421 426
422 427
423 /* 428 /*
424 KPrefsDialogWidBool *confirmCheck = 429 KPrefsDialogWidBool *confirmCheck =
425 addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm), 430 addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
426 topFrame); 431 topFrame);
427 topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1); 432 topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1);
428 433
429 434
430 mEnableGroupScheduling = 435 mEnableGroupScheduling =
431 addWidBool(i18n("Enable group scheduling"), 436 addWidBool(i18n("Enable group scheduling"),
432 &(KOPrefs::instance()->mEnableGroupScheduling),topFrame); 437 &(KOPrefs::instance()->mEnableGroupScheduling),topFrame);
433 topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0); 438 topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0);
434 connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()), 439 connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()),
435 SLOT(warningGroupScheduling())); 440 SLOT(warningGroupScheduling()));
436 441
437 mEnableProjectView = 442 mEnableProjectView =
438 addWidBool(i18n("Enable project view"), 443 addWidBool(i18n("Enable project view"),
439 &(KOPrefs::instance()->mEnableProjectView),topFrame); 444 &(KOPrefs::instance()->mEnableProjectView),topFrame);
440 topLayout->addWidget(mEnableProjectView->checkBox(),9,0); 445 topLayout->addWidget(mEnableProjectView->checkBox(),9,0);
441 connect(mEnableProjectView->checkBox(),SIGNAL(clicked()), 446 connect(mEnableProjectView->checkBox(),SIGNAL(clicked()),
442 SLOT(warningProjectView())); 447 SLOT(warningProjectView()));
443 448
444 // Can't be disabled anymore 449 // Can't be disabled anymore
445 mEnableGroupScheduling->checkBox()->hide(); 450 mEnableGroupScheduling->checkBox()->hide();
446 451
447 // Disable setting, because this feature now becomes stable 452 // Disable setting, because this feature now becomes stable
448 mEnableProjectView->checkBox()->hide(); 453 mEnableProjectView->checkBox()->hide();
449 454
450 KPrefsDialogWidRadios *defaultFormatGroup = 455 KPrefsDialogWidRadios *defaultFormatGroup =
451 addWidRadios(i18n("Default Calendar Format"), 456 addWidRadios(i18n("Default Calendar Format"),
452 &(KOPrefs::instance()->mDefaultFormat),topFrame); 457 &(KOPrefs::instance()->mDefaultFormat),topFrame);
453 defaultFormatGroup->addRadio(i18n("vCalendar")); 458 defaultFormatGroup->addRadio(i18n("vCalendar"));
454 defaultFormatGroup->addRadio(i18n("iCalendar")); 459 defaultFormatGroup->addRadio(i18n("iCalendar"));
455 460
456 topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1); 461 topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1);
457 462
458 // Default format unconditionally is iCalendar 463 // Default format unconditionally is iCalendar
459 defaultFormatGroup->groupBox()->hide(); 464 defaultFormatGroup->groupBox()->hide();
460 465
461 KPrefsDialogWidRadios *mailClientGroup = 466 KPrefsDialogWidRadios *mailClientGroup =
462 addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient), 467 addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient),
463 topFrame); 468 topFrame);
464 mailClientGroup->addRadio(i18n("KMail")); 469 mailClientGroup->addRadio(i18n("KMail"));
465 mailClientGroup->addRadio(i18n("Sendmail")); 470 mailClientGroup->addRadio(i18n("Sendmail"));
466 topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1); 471 topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1);
467 472
468 KPrefsDialogWidBool *htmlsave = 473 KPrefsDialogWidBool *htmlsave =
469 addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave), 474 addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave),
470 topFrame); 475 topFrame);
471 topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1); 476 topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1);
472 477
473 KPrefsDialogWidRadios *destinationGroup = 478 KPrefsDialogWidRadios *destinationGroup =
474 addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination), 479 addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination),
475 topFrame); 480 topFrame);
476 destinationGroup->addRadio(i18n("be added to the standard resource")); 481 destinationGroup->addRadio(i18n("be added to the standard resource"));
477 destinationGroup->addRadio(i18n("be asked which resource to use")); 482 destinationGroup->addRadio(i18n("be asked which resource to use"));
478 topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1); 483 topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1);
479 484
480 topLayout->setRowStretch(14,1); 485 topLayout->setRowStretch(14,1);
481 */ 486 */
482} 487}
483 488
484 489
485void KOPrefsDialog::setupTimeTab() 490void KOPrefsDialog::setupTimeTab()
486{ 491{
487 QFrame *topFrame = addPage(i18n("Time"),0,0); 492 QFrame *topFrame = addPage(i18n("Time"),0,0);
488 // DesktopIcon("clock",KIcon::SizeMedium)); 493 // DesktopIcon("clock",KIcon::SizeMedium));
489 494
490 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 495 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
491 topLayout->setSpacing(spacingHint()); 496 topLayout->setSpacing(mSpacingHint);
492 topLayout->setMargin(marginHint()); 497 topLayout->setMargin(mMarginHint);
493 498
494 QHBox *dummy = new QHBox(topFrame); 499 QHBox *dummy = new QHBox(topFrame);
495 KPrefsDialogWidTime *dayBegins = 500 KPrefsDialogWidTime *dayBegins =
496 addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), 501 addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
497 dummy); 502 dummy);
498 //topLayout->addWidget(dayBegins->label(),2,0); 503 //topLayout->addWidget(dayBegins->label(),2,0);
499 504
500 //topLayout->addWidget(dayBegins->spinBox(),2,1); 505 //topLayout->addWidget(dayBegins->spinBox(),2,1);
501 topLayout->addMultiCellWidget(dummy,0,0,0,1); 506 topLayout->addMultiCellWidget(dummy,0,0,0,1);
502 507
503 topLayout->addWidget(new QLabel(i18n("Default appointment time:"), 508 topLayout->addWidget(new QLabel(i18n("Default appointment time:"),
504 topFrame),1,0); 509 topFrame),1,0);
505 mStartTimeSpin = new QSpinBox(0,23,1,topFrame); 510 mStartTimeSpin = new QSpinBox(0,23,1,topFrame);
506 mStartTimeSpin->setSuffix(":00"); 511 mStartTimeSpin->setSuffix(":00");
507 topLayout->addWidget(mStartTimeSpin,1,1); 512 topLayout->addWidget(mStartTimeSpin,1,1);
508 513
509 topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"), 514 topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"),
510 topFrame),2,0); 515 topFrame),2,0);
511 mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame); 516 mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame);
512 mDefaultDurationSpin->setSuffix(":00"); 517 mDefaultDurationSpin->setSuffix(":00");
513 topLayout->addWidget(mDefaultDurationSpin,2,1); 518 topLayout->addWidget(mDefaultDurationSpin,2,1);
514 519
515 QStringList alarmList; 520 QStringList alarmList;
516 alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes") 521 alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes")
517 << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours") << i18n("24 hours") ; 522 << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours") << i18n("24 hours") ;
518 topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame), 523 topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame),
519 3,0); 524 3,0);
520 mAlarmTimeCombo = new QComboBox(topFrame); 525 mAlarmTimeCombo = new QComboBox(topFrame);
521 mAlarmTimeCombo->insertStringList(alarmList); 526 mAlarmTimeCombo->insertStringList(alarmList);
522 topLayout->addWidget(mAlarmTimeCombo,3,1); 527 topLayout->addWidget(mAlarmTimeCombo,3,1);
523 528
524 529
525 QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal, 530 QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
526 i18n("Working Hours"), 531 i18n("Working Hours"),
527 topFrame); 532 topFrame);
528 topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1); 533 topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
529 workingHoursGroup->layout()->setSpacing( 0 ); 534 workingHoursGroup->layout()->setSpacing( 0 );
530 workingHoursGroup->layout()->setMargin( 4 ); 535 workingHoursGroup->layout()->setMargin( 4 );
531 QHBox *workStartBox = new QHBox(workingHoursGroup); 536 QHBox *workStartBox = new QHBox(workingHoursGroup);
532 // workStartBox->setMargin( 0 ); 537 // workStartBox->setMargin( 0 );
533 addWidTime(i18n("Daily starting hour:"), 538 addWidTime(i18n("Daily starting hour:"),
534 &(KOPrefs::instance()->mWorkingHoursStart),workStartBox); 539 &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
535 540
536 QHBox *workEndBox = new QHBox(workingHoursGroup); 541 QHBox *workEndBox = new QHBox(workingHoursGroup);
537 //workEndBox->setMargin( 0 ); 542 //workEndBox->setMargin( 0 );
538 addWidTime(i18n("Daily ending hour:"), 543 addWidTime(i18n("Daily ending hour:"),
539 &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox); 544 &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
540 QVBox *excludeBox = new QVBox(workingHoursGroup); 545 QVBox *excludeBox = new QVBox(workingHoursGroup);
541 //excludeBox->setMargin( 0 ); 546 //excludeBox->setMargin( 0 );
542 addWidBool(i18n("Exclude holidays"), 547 addWidBool(i18n("Exclude holidays"),
543 &(KOPrefs::instance()->mExcludeHolidays),excludeBox); 548 &(KOPrefs::instance()->mExcludeHolidays),excludeBox);
544 549
545 addWidBool(i18n("Exclude Saturdays"), 550 addWidBool(i18n("Exclude Saturdays"),
546 &(KOPrefs::instance()->mExcludeSaturdays),excludeBox); 551 &(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
547 552
548// KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"), 553// KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
549 // &(KOPrefs::instance()->mMarcusBainsShowSeconds), 554 // &(KOPrefs::instance()->mMarcusBainsShowSeconds),
550 // topFrame); 555 // topFrame);
551// topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0); 556// topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0);
552 557
553 // topLayout->setRowStretch(6,1); 558 // topLayout->setRowStretch(6,1);
554} 559}
555 560
556 561
557void KOPrefsDialog::setupViewsTab() 562void KOPrefsDialog::setupViewsTab()
558{ 563{
559 564
560 QFrame *topFrame = addPage(i18n("Views"),0,0); 565 QFrame *topFrame = addPage(i18n("Views"),0,0);
561 // DesktopIcon("viewmag",KIcon::SizeMedium)); 566 // DesktopIcon("viewmag",KIcon::SizeMedium));
562 567
563 QGridLayout *topLayout = new QGridLayout(topFrame,6,1); 568 QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
564 topLayout->setSpacing(spacingHint()); 569 topLayout->setSpacing(mSpacingHint);
565 topLayout->setMargin(marginHint()); 570 topLayout->setMargin(mMarginHint);
566 571
567// QBoxLayout *dayBeginsLayout = new QHBoxLayout; 572// QBoxLayout *dayBeginsLayout = new QHBoxLayout;
568// topLayout->addLayout(dayBeginsLayout,0,0); 573// topLayout->addLayout(dayBeginsLayout,0,0);
569 574
570// KPrefsDialogWidTime *dayBegins = 575// KPrefsDialogWidTime *dayBegins =
571// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), 576// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
572// topFrame); 577// topFrame);
573// dayBeginsLayout->addWidget(dayBegins->label()); 578// dayBeginsLayout->addWidget(dayBegins->label());
574// dayBeginsLayout->addStretch(1); 579// dayBeginsLayout->addStretch(1);
575// dayBeginsLayout->addWidget(dayBegins->spinBox()); 580// dayBeginsLayout->addWidget(dayBegins->spinBox());
576 581
577// QBoxLayout *nextDaysLayout = new QHBoxLayout; 582// QBoxLayout *nextDaysLayout = new QHBoxLayout;
578// topLayout->addLayout(nextDaysLayout,1,0); 583// topLayout->addLayout(nextDaysLayout,1,0);
579// nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame)); 584// nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame));
580// mNextXDaysSpin = new QSpinBox(2,14,1,topFrame); 585// mNextXDaysSpin = new QSpinBox(2,14,1,topFrame);
581// nextDaysLayout->addStretch(1); 586// nextDaysLayout->addStretch(1);
582// nextDaysLayout->addWidget(mNextXDaysSpin); 587// nextDaysLayout->addWidget(mNextXDaysSpin);
583 588
584 589
585 int ii = 0; 590 int ii = 0;
586 KPrefsDialogWidBool *dummy = 591 KPrefsDialogWidBool *dummy =
587 addWidBool(i18n("Edit item on doubleclick (if not, show)"), 592 addWidBool(i18n("Edit item on doubleclick (if not, show)"),
588 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame); 593 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame);
589 topLayout->addWidget(dummy->checkBox(),ii++,0); 594 topLayout->addWidget(dummy->checkBox(),ii++,0);
590 595
591 596
592 597
593 598
594 599
595 600
596 // topLayout->addWidget(hourSizeGroup,ii++,0); 601 // topLayout->addWidget(hourSizeGroup,ii++,0);
597 // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0); 602 // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0);
598 //topLayout->setRowStretch(11,1); 603 //topLayout->setRowStretch(11,1);
599 604
600 605
601 606
602 607
603#if 0 608#if 0
604 609
605 topFrame = addPage(i18n("ViewChange"),0,0); 610 topFrame = addPage(i18n("ViewChange"),0,0);
606 // DesktopIcon("viewmag",KIcon::SizeMedium)); 611 // DesktopIcon("viewmag",KIcon::SizeMedium));
607 612
608 topLayout = new QGridLayout(topFrame,6,1); 613 topLayout = new QGridLayout(topFrame,6,1);
609 topLayout->setSpacing(spacingHint()); 614 topLayout->setSpacing(mSpacingHint);
610 topLayout->setMargin(marginHint()); 615 topLayout->setMargin(mMarginHint);
611 ii = 0; 616 ii = 0;
612 617
613#endif 618#endif
614 619
615 dummy = 620 dummy =
616 addWidBool(i18n("Hold fullscreen on view change"), 621 addWidBool(i18n("Hold fullscreen on view change"),
617 &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame); 622 &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame);
618 topLayout->addWidget(dummy->checkBox(),ii++,0); 623 topLayout->addWidget(dummy->checkBox(),ii++,0);
619 624
620 dummy = 625 dummy =
621 addWidBool(i18n("Hold non-fullscreen on view change"), 626 addWidBool(i18n("Hold non-fullscreen on view change"),
622 &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame); 627 &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame);
623 topLayout->addWidget(dummy->checkBox(),ii++,0); 628 topLayout->addWidget(dummy->checkBox(),ii++,0);
624 629
625 630
626 631
627 KPrefsDialogWidBool *fullViewMonth = 632 KPrefsDialogWidBool *fullViewMonth =
628 addWidBool(i18n("Next days view uses full window"), 633 addWidBool(i18n("Next days view uses full window"),
629 &(KOPrefs::instance()->mFullViewMonth),topFrame); 634 &(KOPrefs::instance()->mFullViewMonth),topFrame);
630 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); 635 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0);
631 636
632 637
633 KPrefsDialogWidBool *fullViewTodo = 638 KPrefsDialogWidBool *fullViewTodo =
634 addWidBool(i18n("Event list view uses full window"), 639 addWidBool(i18n("Event list view uses full window"),
635 &(KOPrefs::instance()->mFullViewTodo),topFrame); 640 &(KOPrefs::instance()->mFullViewTodo),topFrame);
636 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0); 641 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
637 dummy = 642 dummy =
638 addWidBool(i18n("Listview uses monthly timespan"), 643 addWidBool(i18n("Listview uses monthly timespan"),
639 &(KOPrefs::instance()->mListViewMonthTimespan),topFrame); 644 &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
640 topLayout->addWidget(dummy->checkBox(),ii++,0); 645 topLayout->addWidget(dummy->checkBox(),ii++,0);
641 dummy = 646 dummy =
642 addWidBool(i18n("Highlight selection in Time Edit"), 647 addWidBool(i18n("Highlight selection in Time Edit"),
643 &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame); 648 &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
644 topLayout->addWidget( dummy->checkBox(), ii++,0); 649 topLayout->addWidget( dummy->checkBox(), ii++,0);
645 650
646 KPrefsDialogWidBool *dailyRecur = 651 KPrefsDialogWidBool *dailyRecur =
647 addWidBool(i18n("Show events that recur daily in date nav."), 652 addWidBool(i18n("Show events that recur daily in date nav."),
648 &(KOPrefs::instance()->mDailyRecur),topFrame); 653 &(KOPrefs::instance()->mDailyRecur),topFrame);
649 topLayout->addWidget(dailyRecur->checkBox(),ii++,0); 654 topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
650 655
651 KPrefsDialogWidBool *weeklyRecur = 656 KPrefsDialogWidBool *weeklyRecur =
652 addWidBool(i18n("Show ev. that recur weekly in date nav."), 657 addWidBool(i18n("Show ev. that recur weekly in date nav."),
653 &(KOPrefs::instance()->mWeeklyRecur),topFrame); 658 &(KOPrefs::instance()->mWeeklyRecur),topFrame);
654 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); 659 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
655 660
656 661#ifdef DESKTOP_VERSION
657 KPrefsDialogWidBool *enableToolTips = 662 KPrefsDialogWidBool *enableToolTips =
658 addWidBool(i18n("Enable tooltips displaying summary of ev."), 663 addWidBool(i18n("Enable tooltips displaying summary of ev."),
659 &(KOPrefs::instance()->mEnableToolTips),topFrame); 664 &(KOPrefs::instance()->mEnableToolTips),topFrame);
660 topLayout->addWidget(enableToolTips->checkBox(),ii++,0); 665 topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
661 666#endif
662 // ********************************************************* 667 // *********************************************************
663 668
664 topFrame = addPage(i18n("Agenda View"),0,0); 669 topFrame = addPage(i18n("Agenda View"),0,0);
665 // DesktopIcon("viewmag",KIcon::SizeMedium)); 670 // DesktopIcon("viewmag",KIcon::SizeMedium));
666 671
667 topLayout = new QGridLayout(topFrame,5,1); 672 topLayout = new QGridLayout(topFrame,5,1);
668 topLayout->setSpacing(spacingHint()); 673 topLayout->setSpacing(mSpacingHint);
669 topLayout->setMargin(marginHint()); 674 topLayout->setMargin(mMarginHint);
670 ii = 0; 675 ii = 0;
671 676
672 677
673 dummy = 678 dummy =
674 addWidBool(i18n("Show time in agenda items"), 679 addWidBool(i18n("Show time in agenda items"),
675 &(KOPrefs::instance()->mShowTimeInAgenda),topFrame); 680 &(KOPrefs::instance()->mShowTimeInAgenda),topFrame);
676 topLayout->addWidget(dummy->checkBox(),ii++,0); 681 topLayout->addWidget(dummy->checkBox(),ii++,0);
677 682
678 dummy = 683 dummy =
679 addWidBool(i18n("Highlight current day in agenda"), 684 addWidBool(i18n("Highlight current day in agenda"),
680 &(KOPrefs::instance()->mHighlightCurrentDay),topFrame); 685 &(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
681 topLayout->addWidget(dummy->checkBox(),ii++,0); 686 topLayout->addWidget(dummy->checkBox(),ii++,0);
682 687
683 dummy = 688 dummy =
684 addWidBool(i18n("Use light color for highlight current day"), 689 addWidBool(i18n("Use light color for highlight current day"),
685 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); 690 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
686 topLayout->addWidget(dummy->checkBox(),ii++,0); 691 topLayout->addWidget(dummy->checkBox(),ii++,0);
687 692
688 693
689 KPrefsDialogWidBool *marcusBainsEnabled = 694 KPrefsDialogWidBool *marcusBainsEnabled =
690 addWidBool(i18n("Show current time"), 695 addWidBool(i18n("Show current time"),
691 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); 696 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
692 topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); 697 topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
693 698
694 699
695 dummy = 700 dummy =
696 addWidBool(i18n("Set agenda to DayBeginsAt on change"), 701 addWidBool(i18n("Set agenda to DayBeginsAt on change"),
697 &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); 702 &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame);
698 topLayout->addWidget(dummy->checkBox(),ii++,0); 703 topLayout->addWidget(dummy->checkBox(),ii++,0);
699 704
700 dummy = 705 dummy =
701 addWidBool(i18n("Set agenda to current time on change"), 706 addWidBool(i18n("Set agenda to current time on change"),
702 &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); 707 &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame);
703 topLayout->addWidget(dummy->checkBox(),ii++,0); 708 topLayout->addWidget(dummy->checkBox(),ii++,0);
704 709
705 710
706 711
707 712
708 713
709 714
710 715
711 topFrame = addPage(i18n("Month View"),0,0); 716 topFrame = addPage(i18n("Month View"),0,0);
712 // DesktopIcon("viewmag",KIcon::SizeMedium)); 717 // DesktopIcon("viewmag",KIcon::SizeMedium));
713 718
714 topLayout = new QGridLayout(topFrame,5,1); 719 topLayout = new QGridLayout(topFrame,5,1);
715 topLayout->setSpacing(spacingHint()); 720 topLayout->setSpacing(mSpacingHint);
716 topLayout->setMargin(marginHint()); 721 topLayout->setMargin(mMarginHint);
722 qDebug("%d %d ",mSpacingHint, mMarginHint );
717 ii = 0; 723 ii = 0;
718 QLabel *lab; 724 QLabel *lab;
719 QHBox *habo = new QHBox( topFrame ); 725 QHBox *habo = new QHBox( topFrame );
720 if ( QApplication::desktop()->width() <= 480 ) { 726 if ( QApplication::desktop()->width() <= 480 ) {
721 lab = new QLabel ( i18n("Show events that recur "), topFrame ); 727 lab = new QLabel ( i18n("Show events that recur "), topFrame );
722 topLayout->addMultiCellWidget(lab,ii, ii,0,1); 728 topLayout->addMultiCellWidget(lab,ii, ii,0,1);
723 ii++; 729 ii++;
724 } else { 730 } else {
725 new QLabel ( i18n("Show events that recur "), habo ); 731 new QLabel ( i18n("Show events that recur "), habo );
726 } 732 }
727 dailyRecur = 733 dailyRecur =
728 addWidBool(i18n("daily"), 734 addWidBool(i18n("daily"),
729 &(KOPrefs::instance()->mMonthDailyRecur),habo); 735 &(KOPrefs::instance()->mMonthDailyRecur),habo);
730 // topLayout->addWidget(dailyRecur->checkBox(),ii++,0); 736 // topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
731 737
732 weeklyRecur = 738 weeklyRecur =
733 addWidBool(i18n("weekly"), 739 addWidBool(i18n("weekly"),
734 &(KOPrefs::instance()->mMonthWeeklyRecur),habo); 740 &(KOPrefs::instance()->mMonthWeeklyRecur),habo);
735 topLayout->addMultiCellWidget(habo,ii, ii,0,1); 741 topLayout->addMultiCellWidget(habo,ii, ii,0,1);
736 ii++; 742 ii++;
737 743
738 744
739 habo = new QHBox( topFrame ); 745 habo = new QHBox( topFrame );
740 if ( QApplication::desktop()->width() <= 480 ) { 746 if ( QApplication::desktop()->width() <= 480 ) {
741 lab = new QLabel (i18n("Show in every cell ") , topFrame ); 747 lab = new QLabel (i18n("Show in every cell ") , topFrame );
742 topLayout->addMultiCellWidget(lab,ii, ii,0,1); 748 topLayout->addMultiCellWidget(lab,ii, ii,0,1);
743 ii++; 749 ii++;
744 750
745 } else { 751 } else {
746 new QLabel ( i18n("Show in every cell "), habo ); 752 new QLabel ( i18n("Show in every cell "), habo );
747 } 753 }
748 weeklyRecur = 754 weeklyRecur =
749 addWidBool(i18n("short month"), 755 addWidBool(i18n("short month"),
750 &(KOPrefs::instance()->mMonthShowShort),habo); 756 &(KOPrefs::instance()->mMonthShowShort),habo);
751 weeklyRecur = 757 weeklyRecur =
752 addWidBool(i18n("icons"), 758 addWidBool(i18n("icons"),
753 &(KOPrefs::instance()->mMonthShowIcons),habo); 759 &(KOPrefs::instance()->mMonthShowIcons),habo);
754 760
755 topLayout->addMultiCellWidget(habo,ii, ii,0,1); 761 topLayout->addMultiCellWidget(habo,ii, ii,0,1);
756 ii++; 762 ii++;
757#ifdef DESKTOP_VERSION 763#ifdef DESKTOP_VERSION
758 KPrefsDialogWidBool *enableMonthScroll = 764 KPrefsDialogWidBool *enableMonthScroll =
759 addWidBool(i18n("Enable scrollbars in month view cells"), 765 addWidBool(i18n("Enable scrollbars in month view cells"),
760 &(KOPrefs::instance()->mEnableMonthScroll),topFrame); 766 &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
761 topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); 767 topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0);
762#endif 768#endif
763 dummy = 769 dummy =
764 addWidBool(i18n("Week view mode uses bigger font"), 770 addWidBool(i18n("Week view mode uses bigger font"),
765 &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame); 771 &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame);
766 topLayout->addWidget(dummy->checkBox(),ii++,0); 772 topLayout->addWidget(dummy->checkBox(),ii++,0);
767 dummy = 773 dummy =
768 addWidBool(i18n("Show Sat/Sun together"), 774 addWidBool(i18n("Show Sat/Sun together"),
769 &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); 775 &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame);
770 topLayout->addWidget(dummy->checkBox(),ii++,0); 776 topLayout->addWidget(dummy->checkBox(),ii++,0);
771 777
772 KPrefsDialogWidBool *coloredCategoriesInMonthView = 778 KPrefsDialogWidBool *coloredCategoriesInMonthView =
773 addWidBool(i18n("Month view uses category colors"), 779 addWidBool(i18n("Month view uses category colors"),
774 &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); 780 &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
775 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 781 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
776 782
777 dummy = 783 dummy =
778 addWidBool(i18n("Categorie colors are applied to text"), 784 addWidBool(i18n("Categorie colors are applied to text"),
779 &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); 785 &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
780 topLayout->addWidget(dummy->checkBox(),ii++,0); 786 topLayout->addWidget(dummy->checkBox(),ii++,0);
781 coloredCategoriesInMonthView = 787 coloredCategoriesInMonthView =
782 addWidBool(i18n("Month view uses day colors"), 788 addWidBool(i18n("Month view uses day colors"),
783 &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); 789 &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
784 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 790 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
785 791
786 KPrefsDialogWidColor *holidayColor = 792 KPrefsDialogWidColor *holidayColor =
787 addWidColor(i18n("Day color odd months"), 793 addWidColor(i18n("Day color odd months"),
788 &(KOPrefs::instance()->mMonthViewOddColor),topFrame); 794 &(KOPrefs::instance()->mMonthViewOddColor),topFrame);
789 topLayout->addWidget(holidayColor->label(),ii,0); 795 topLayout->addWidget(holidayColor->label(),ii,0);
790 topLayout->addWidget(holidayColor->button(),ii++,1); 796 topLayout->addWidget(holidayColor->button(),ii++,1);
791 797
792 holidayColor = 798 holidayColor =
793 addWidColor(i18n("Day color even months"), 799 addWidColor(i18n("Day color even months"),
794 &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); 800 &(KOPrefs::instance()->mMonthViewEvenColor),topFrame);
795 topLayout->addWidget(holidayColor->label(),ii,0); 801 topLayout->addWidget(holidayColor->label(),ii,0);
796 topLayout->addWidget(holidayColor->button(),ii++,1); 802 topLayout->addWidget(holidayColor->button(),ii++,1);
797 803
798 804
799 holidayColor = 805 holidayColor =
800 addWidColor(i18n("Color for Sundays + category \"Holiday\""), 806 addWidColor(i18n("Color for Sundays + category \"Holiday\""),
801 &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); 807 &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame);
802 topLayout->addWidget(holidayColor->label(),ii,0); 808 topLayout->addWidget(holidayColor->label(),ii,0);
803 topLayout->addWidget(holidayColor->button(),ii++,1); 809 topLayout->addWidget(holidayColor->button(),ii++,1);
804 // *********************** What'sNext View 810 // *********************** What'sNext View
805 topFrame = addPage(i18n("What's Next View"),0,0); 811 topFrame = addPage(i18n("What's Next View"),0,0);
806 // DesktopIcon("viewmag",KIcon::SizeMedium)); 812 // DesktopIcon("viewmag",KIcon::SizeMedium));
807 813
808 topLayout = new QGridLayout(topFrame,4,1); 814 topLayout = new QGridLayout(topFrame,4,1);
809 topLayout->setSpacing(spacingHint()); 815 topLayout->setSpacing(mSpacingHint);
810 topLayout->setMargin(marginHint()); 816 topLayout->setMargin(mMarginHint);
811 ii = 0; 817 ii = 0;
812 818
813 819
814 QHBox* hdummy = new QHBox(topFrame); 820 QHBox* hdummy = new QHBox(topFrame);
815 new QLabel(i18n("Days in What's Next:"),hdummy); 821 new QLabel(i18n("Days in What's Next:"),hdummy);
816 mWhatsNextSpin = new QSpinBox(1,14,1,hdummy); 822 mWhatsNextSpin = new QSpinBox(1,14,1,hdummy);
817 823
818 topLayout->addWidget(hdummy,ii++,0); 824 topLayout->addWidget(hdummy,ii++,0);
819 825
820 QHBox *prioBox = new QHBox(topFrame); 826 QHBox *prioBox = new QHBox(topFrame);
821 // intervalBox->setSpacing(spacingHint()); 827 // intervalBox->setSpacing(mSpacingHint);
822 topLayout->addWidget(prioBox,ii++,0); 828 topLayout->addWidget(prioBox,ii++,0);
823 QString messa = i18n("Show topmost todo prios in What's Next:"); 829 QString messa = i18n("Show topmost todo prios in What's Next:");
824 830
825 if ( QApplication::desktop()->width() < 300 ) 831 if ( QApplication::desktop()->width() < 300 )
826 messa = i18n("Show topmost todo prios in What's N.:"); 832 messa = i18n("Show topmost todo prios in What's N.:");
827 QLabel *prioLabel = new QLabel(messa, prioBox); 833 QLabel *prioLabel = new QLabel(messa, prioBox);
828 mPrioSpin = new QSpinBox(0,5,1,prioBox); 834 mPrioSpin = new QSpinBox(0,5,1,prioBox);
829 if ( QApplication::desktop()->width() < 300 ) 835 if ( QApplication::desktop()->width() < 300 )
830 mPrioSpin->setFixedWidth( 40 ); 836 mPrioSpin->setFixedWidth( 40 );
831 837
832 KPrefsDialogWidBool *passwdk = 838 KPrefsDialogWidBool *passwdk =
833 839
834 addWidBool(i18n("Show events, that are done in \nWhat's Next view"), 840 addWidBool(i18n("Show events, that are done in \nWhat's Next view"),
835 &(KOPrefs::instance()->mWNViewShowsPast),topFrame); 841 &(KOPrefs::instance()->mWNViewShowsPast),topFrame);
836 topLayout->addWidget(passwdk->checkBox(), ii++,0); 842 topLayout->addWidget(passwdk->checkBox(), ii++,0);
837 passwdk = 843 passwdk =
838 addWidBool(i18n("Show parent To-Do's in What's Next view"), 844 addWidBool(i18n("Show parent To-Do's in What's Next view"),
839 &(KOPrefs::instance()->mWNViewShowsParents),topFrame); 845 &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
840 topLayout->addWidget(passwdk->checkBox(), ii++,0); 846 topLayout->addWidget(passwdk->checkBox(), ii++,0);
841 847
842 passwdk = 848 passwdk =
843 addWidBool(i18n("Show location in What's Next view"), 849 addWidBool(i18n("Show location in What's Next view"),
844 &(KOPrefs::instance()->mWNViewShowLocation),topFrame); 850 &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
845 topLayout->addWidget(passwdk->checkBox(), ii++,0); 851 topLayout->addWidget(passwdk->checkBox(), ii++,0);
846 852
847 passwdk = 853 passwdk =
848 addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"), 854 addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"),
849 &(KOPrefs::instance()->mShowSyncEvents),topFrame); 855 &(KOPrefs::instance()->mShowSyncEvents),topFrame);
850 topLayout->addWidget(passwdk->checkBox(), ii++,0); 856 topLayout->addWidget(passwdk->checkBox(), ii++,0);
851 passwdk = 857 passwdk =
852 addWidBool(i18n("Use short date in \nWhat's Next/Event view"), 858 addWidBool(i18n("Use short date in \nWhat's Next/Event view"),
853 &(KOPrefs::instance()->mShortDateInViewer),topFrame); 859 &(KOPrefs::instance()->mShortDateInViewer),topFrame);
854 topLayout->addWidget(passwdk->checkBox(), ii++,0); 860 topLayout->addWidget(passwdk->checkBox(), ii++,0);
855 861
856 862
857 863
858 864
859 // *********************** Todo View 865 // *********************** Todo View
860 866
861 topFrame = addPage(i18n("Todo View"),0,0); 867 topFrame = addPage(i18n("Todo View"),0,0);
862 // DesktopIcon("viewmag",KIcon::SizeMedium)); 868 // DesktopIcon("viewmag",KIcon::SizeMedium));
863 869
864 topLayout = new QGridLayout(topFrame,4,1); 870 topLayout = new QGridLayout(topFrame,4,1);
865 topLayout->setSpacing(spacingHint()); 871 topLayout->setSpacing(mSpacingHint);
866 topLayout->setMargin(marginHint()); 872 topLayout->setMargin(mMarginHint);
867 ii = 0; 873 ii = 0;
868dummy = 874dummy =
869 addWidBool(i18n("Hide not running Todos in To-do view"), 875 addWidBool(i18n("Hide not running Todos in To-do view"),
870 &(KOPrefs::instance()->mHideNonStartedTodos),topFrame); 876 &(KOPrefs::instance()->mHideNonStartedTodos),topFrame);
871 topLayout->addWidget(dummy->checkBox(),ii++,0); 877 topLayout->addWidget(dummy->checkBox(),ii++,0);
872 878
873 879
874 KPrefsDialogWidBool *showCompletedTodo = 880 KPrefsDialogWidBool *showCompletedTodo =
875 addWidBool(i18n("To-do view shows completed Todos"), 881 addWidBool(i18n("To-do view shows completed Todos"),
876 &(KOPrefs::instance()->mShowCompletedTodo),topFrame); 882 &(KOPrefs::instance()->mShowCompletedTodo),topFrame);
877 topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0); 883 topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0);
878 dummy = 884 dummy =
879 addWidBool(i18n("To-do view shows complete as 'xx %'"), 885 addWidBool(i18n("To-do view shows complete as 'xx %'"),
880 &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame); 886 &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame);
881 topLayout->addWidget(dummy->checkBox(),ii++,0); 887 topLayout->addWidget(dummy->checkBox(),ii++,0);
882 888
883 dummy = 889 dummy =
884 addWidBool(i18n("Small To-do view uses smaller font"), 890 addWidBool(i18n("Small To-do view uses smaller font"),
885 &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame); 891 &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame);
886 topLayout->addWidget(dummy->checkBox(),ii++,0); 892 topLayout->addWidget(dummy->checkBox(),ii++,0);
887 893
888 894
889 895
890 dummy = 896 dummy =
891 addWidBool(i18n("Todo view uses category colors"), 897 addWidBool(i18n("Todo view uses category colors"),
892 &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame); 898 &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame);
893 topLayout->addWidget(dummy->checkBox(),ii++,0); 899 topLayout->addWidget(dummy->checkBox(),ii++,0);
894 900
895 901
896 QWidget* wid = new QWidget( topFrame ); 902 QWidget* wid = new QWidget( topFrame );
897 // Todo due today color 903 // Todo due today color
898 KPrefsDialogWidColor *todoDueTodayColor = 904 KPrefsDialogWidColor *todoDueTodayColor =
899 addWidColor(i18n("Todo due today color:"), 905 addWidColor(i18n("Todo due today color:"),
900 &(KOPrefs::instance()->mTodoDueTodayColor),wid); 906 &(KOPrefs::instance()->mTodoDueTodayColor),wid);
901 QHBoxLayout *widLayout = new QHBoxLayout(wid); 907 QHBoxLayout *widLayout = new QHBoxLayout(wid);
902 widLayout->addWidget( todoDueTodayColor->label() ); 908 widLayout->addWidget( todoDueTodayColor->label() );
903 widLayout->addWidget( todoDueTodayColor->button() ); 909 widLayout->addWidget( todoDueTodayColor->button() );
904 topLayout->addWidget(wid,ii++,0); 910 topLayout->addWidget(wid,ii++,0);
905 //topLayout->addWidget(todoDueTodayColor->button(),ii++,1); 911 //topLayout->addWidget(todoDueTodayColor->button(),ii++,1);
906 912
907 // Todo overdue color 913 // Todo overdue color
908 wid = new QWidget( topFrame ); 914 wid = new QWidget( topFrame );
909 widLayout = new QHBoxLayout(wid); 915 widLayout = new QHBoxLayout(wid);
910 KPrefsDialogWidColor *todoOverdueColor = 916 KPrefsDialogWidColor *todoOverdueColor =
911 addWidColor(i18n("Todo overdue color:"), 917 addWidColor(i18n("Todo overdue color:"),
912 &(KOPrefs::instance()->mTodoOverdueColor),wid); 918 &(KOPrefs::instance()->mTodoOverdueColor),wid);
913 widLayout->addWidget(todoOverdueColor->label()); 919 widLayout->addWidget(todoOverdueColor->label());
914 widLayout->addWidget(todoOverdueColor->button()); 920 widLayout->addWidget(todoOverdueColor->button());
915 topLayout->addWidget(wid,ii++,0); 921 topLayout->addWidget(wid,ii++,0);
916 922
917 dummy = 923 dummy =
918 addWidBool(i18n("Colors are applied to text"), 924 addWidBool(i18n("Colors are applied to text"),
919 &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame); 925 &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame);
920 topLayout->addWidget(dummy->checkBox(),ii++,0); 926 topLayout->addWidget(dummy->checkBox(),ii++,0);
921 927
922 dummy = 928 dummy =
923 addWidBool(i18n("Allday Agenda view shows todos"), 929 addWidBool(i18n("Allday Agenda view shows todos"),
924 &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); 930 &(KOPrefs::instance()->mShowTodoInAgenda),topFrame);
925 topLayout->addWidget(dummy->checkBox(),ii++,0); 931 topLayout->addWidget(dummy->checkBox(),ii++,0);
926 932
927 933
928 topFrame = addPage(i18n("View Options"),0,0); 934 topFrame = addPage(i18n("View Options"),0,0);
929 935
930 topLayout = new QGridLayout(topFrame,4,1); 936 topLayout = new QGridLayout(topFrame,4,1);
931 topLayout->setSpacing(spacingHint()); 937 topLayout->setSpacing(mSpacingHint);
932 topLayout->setMargin(marginHint()); 938 topLayout->setMargin(mMarginHint);
933 ii = 0; 939 ii = 0;
934 lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); 940 lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame);
935 topLayout->addWidget(lab ,ii++,0); 941 topLayout->addWidget(lab ,ii++,0);
936 942
937 dummy = addWidBool(i18n("Details"), 943 dummy = addWidBool(i18n("Details"),
938 &(KOPrefs::instance()->mEVshowDetails),topFrame); 944 &(KOPrefs::instance()->mEVshowDetails),topFrame);
939 topLayout->addWidget(dummy->checkBox(),ii++,0); 945 topLayout->addWidget(dummy->checkBox(),ii++,0);
940 dummy = addWidBool(i18n("Created time"), 946 dummy = addWidBool(i18n("Created time"),
941 &(KOPrefs::instance()->mEVshowCreated),topFrame); 947 &(KOPrefs::instance()->mEVshowCreated),topFrame);
942 topLayout->addWidget(dummy->checkBox(),ii++,0); 948 topLayout->addWidget(dummy->checkBox(),ii++,0);
943 dummy = addWidBool(i18n("Last modified time"), 949 dummy = addWidBool(i18n("Last modified time"),
944 &(KOPrefs::instance()->mEVshowChanged),topFrame); 950 &(KOPrefs::instance()->mEVshowChanged),topFrame);
945 topLayout->addWidget(dummy->checkBox(),ii++,0); 951 topLayout->addWidget(dummy->checkBox(),ii++,0);
946 952
947 953
948 lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame); 954 lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame);
949 topLayout->addWidget(lab ,ii++,0); 955 topLayout->addWidget(lab ,ii++,0);
950 956
951 dummy = addWidBool(i18n("Details"), 957 dummy = addWidBool(i18n("Details"),
952 &(KOPrefs::instance()->mWTshowDetails),topFrame); 958 &(KOPrefs::instance()->mWTshowDetails),topFrame);
953 topLayout->addWidget(dummy->checkBox(),ii++,0); 959 topLayout->addWidget(dummy->checkBox(),ii++,0);
954 dummy = addWidBool(i18n("Created time"), 960 dummy = addWidBool(i18n("Created time"),
955 &(KOPrefs::instance()->mWTshowCreated),topFrame); 961 &(KOPrefs::instance()->mWTshowCreated),topFrame);
956 topLayout->addWidget(dummy->checkBox(),ii++,0); 962 topLayout->addWidget(dummy->checkBox(),ii++,0);
957 dummy = addWidBool(i18n("Last modified time"), 963 dummy = addWidBool(i18n("Last modified time"),
958 &(KOPrefs::instance()->mWTshowChanged),topFrame); 964 &(KOPrefs::instance()->mWTshowChanged),topFrame);
959 topLayout->addWidget(dummy->checkBox(),ii++,0); 965 topLayout->addWidget(dummy->checkBox(),ii++,0);
960 966
961 967
962 topFrame = addPage(i18n("Alarm"),0,0); 968 topFrame = addPage(i18n("Alarm"),0,0);
963 // DesktopIcon("viewmag",KIcon::SizeMedium)); 969 // DesktopIcon("viewmag",KIcon::SizeMedium));
964 970
965 topLayout = new QGridLayout(topFrame,2,1); 971 topLayout = new QGridLayout(topFrame,2,1);
966 topLayout->setSpacing(spacingHint()); 972 topLayout->setSpacing(mSpacingHint);
967 topLayout->setMargin(marginHint()); 973 topLayout->setMargin(mMarginHint);
968 int iii = 0; 974 int iii = 0;
969 975
970 dummy = 976 dummy =
971 addWidBool(i18n("Use internal alarm notification"), 977 addWidBool(i18n("Use internal alarm notification"),
972 &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame); 978 &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame);
973 topLayout->addWidget(dummy->checkBox(),iii++,0); 979 topLayout->addWidget(dummy->checkBox(),iii++,0);
974 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); 980 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);
975 981
976 topLayout->addWidget(lab ,iii++,0); 982 topLayout->addWidget(lab ,iii++,0);
977#ifndef DESKTOP_VERSION 983#ifndef DESKTOP_VERSION
978 lab->setAlignment( AlignLeft|WordBreak|AlignTop); 984 lab->setAlignment( AlignLeft|WordBreak|AlignTop);
979#else 985#else
980 lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); 986 lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
981 lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) ); 987 lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
982#endif 988#endif
983 989
984 QHBox* dummyBox = new QHBox(topFrame); 990 QHBox* dummyBox = new QHBox(topFrame);
985 new QLabel(i18n("Play beeps count:"),dummyBox); 991 new QLabel(i18n("Play beeps count:"),dummyBox);
986 mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox); 992 mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox);
987 topLayout->addWidget(dummyBox,iii++,0); 993 topLayout->addWidget(dummyBox,iii++,0);
988 994
989 dummyBox = new QHBox(topFrame); 995 dummyBox = new QHBox(topFrame);
990 new QLabel(i18n("Beeps interval in sec:"),dummyBox); 996 new QLabel(i18n("Beeps interval in sec:"),dummyBox);
991 mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox); 997 mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox);
992 topLayout->addWidget(dummyBox,iii++,0); 998 topLayout->addWidget(dummyBox,iii++,0);
993 999
994 dummyBox = new QHBox(topFrame); 1000 dummyBox = new QHBox(topFrame);
995 new QLabel(i18n("Default suspend time in min:"),dummyBox); 1001 new QLabel(i18n("Default suspend time in min:"),dummyBox);
996 mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox); 1002 mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox);
997 topLayout->addWidget(dummyBox,iii++,0); 1003 topLayout->addWidget(dummyBox,iii++,0);
998 1004
999 dummyBox = new QHBox(topFrame); 1005 dummyBox = new QHBox(topFrame);
1000 new QLabel(i18n("Auto suspend count:"),dummyBox); 1006 new QLabel(i18n("Auto suspend count:"),dummyBox);
1001 mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox); 1007 mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox);
1002 topLayout->addWidget(dummyBox,iii++,0); 1008 topLayout->addWidget(dummyBox,iii++,0);
1003 1009
1004 1010
1005 1011
1006 1012
1007 1013
1008 1014
1009 1015
1010 QHBox* hbo = new QHBox ( topFrame ); 1016 QHBox* hbo = new QHBox ( topFrame );
1011 mDefaultAlarmFile = new QLineEdit(hbo); 1017 mDefaultAlarmFile = new QLineEdit(hbo);
1012 QPushButton * loadTemplate = new QPushButton(hbo); 1018 QPushButton * loadTemplate = new QPushButton(hbo);
1013 QPixmap icon; 1019 QPixmap icon;
1014 if ( QApplication::desktop()->width() < 321 ) 1020 if ( QApplication::desktop()->width() < 321 )
1015 icon = SmallIcon("fileimport16"); 1021 icon = SmallIcon("fileimport16");
1016 else 1022 else
1017 icon = SmallIcon("fileimport"); 1023 icon = SmallIcon("fileimport");
1018 loadTemplate->setIconSet (icon ) ; 1024 loadTemplate->setIconSet (icon ) ;
1019 connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( selectSoundFile() ) ); 1025 connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( selectSoundFile() ) );
1020 int size = loadTemplate->sizeHint().height(); 1026 int size = loadTemplate->sizeHint().height();
1021 loadTemplate->setFixedSize( size, size ); 1027 loadTemplate->setFixedSize( size, size );
1022 //lab = new QLabel( i18n("This setting is useless for 5500 user!"), topFrame); 1028 //lab = new QLabel( i18n("This setting is useless for 5500 user!"), topFrame);
1023 // topLayout->addWidget(lab ,iii++,0); 1029 // topLayout->addWidget(lab ,iii++,0);
1024 lab = new QLabel( i18n("Alarm *.wav file for newly created alarm:"), topFrame); 1030 lab = new QLabel( i18n("Alarm *.wav file for newly created alarm:"), topFrame);
1025 topLayout->addWidget(lab ,iii++,0); 1031 topLayout->addWidget(lab ,iii++,0);
1026 topLayout->addWidget(hbo,iii++,0); 1032 topLayout->addWidget(hbo,iii++,0);
1027 // 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); 1033 // 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);
1028 1034
1029// topLayout->addWidget(lab ,iii++,0); 1035// topLayout->addWidget(lab ,iii++,0);
1030// #ifndef DESKTOP_VERSION 1036// #ifndef DESKTOP_VERSION
1031// lab->setAlignment( AlignLeft|WordBreak|AlignTop); 1037// lab->setAlignment( AlignLeft|WordBreak|AlignTop);
@@ -1128,303 +1134,303 @@ void KOPrefsDialog::setupFontsTab()
1128 topLayout->addWidget(tVFont->preview(),i,1); 1134 topLayout->addWidget(tVFont->preview(),i,1);
1129 topLayout->addWidget(tVFont->button(),i,2); 1135 topLayout->addWidget(tVFont->button(),i,2);
1130 ++i; 1136 ++i;
1131 KPrefsDialogWidFont *agendaViewFont = 1137 KPrefsDialogWidFont *agendaViewFont =
1132 addWidFont(i18n("Event text"),i18n("Agenda view:"), 1138 addWidFont(i18n("Event text"),i18n("Agenda view:"),
1133 &(KOPrefs::instance()->mAgendaViewFont),topFrame); 1139 &(KOPrefs::instance()->mAgendaViewFont),topFrame);
1134 topLayout->addWidget(agendaViewFont->label(),i,0); 1140 topLayout->addWidget(agendaViewFont->label(),i,0);
1135 topLayout->addWidget(agendaViewFont->preview(),i,1); 1141 topLayout->addWidget(agendaViewFont->preview(),i,1);
1136 topLayout->addWidget(agendaViewFont->button(),i,2); 1142 topLayout->addWidget(agendaViewFont->button(),i,2);
1137 ++i; 1143 ++i;
1138 1144
1139 1145
1140 KPrefsDialogWidFont *monthViewFont = 1146 KPrefsDialogWidFont *monthViewFont =
1141 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"), 1147 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"),
1142 i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame); 1148 i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame);
1143 topLayout->addWidget(monthViewFont->label(),i,0); 1149 topLayout->addWidget(monthViewFont->label(),i,0);
1144 topLayout->addWidget(monthViewFont->preview(),i,1); 1150 topLayout->addWidget(monthViewFont->preview(),i,1);
1145 topLayout->addWidget(monthViewFont->button(),i,2); 1151 topLayout->addWidget(monthViewFont->button(),i,2);
1146 ++i; 1152 ++i;
1147 1153
1148 1154
1149 KPrefsDialogWidFont *lVFont = 1155 KPrefsDialogWidFont *lVFont =
1150 addWidFont(i18n("Event"),i18n("List View:"), 1156 addWidFont(i18n("Event"),i18n("List View:"),
1151 &(KOPrefs::instance()->mListViewFont),topFrame); 1157 &(KOPrefs::instance()->mListViewFont),topFrame);
1152 topLayout->addWidget(lVFont->label(),i,0); 1158 topLayout->addWidget(lVFont->label(),i,0);
1153 topLayout->addWidget(lVFont->preview(),i,1); 1159 topLayout->addWidget(lVFont->preview(),i,1);
1154 topLayout->addWidget(lVFont->button(),i,2); 1160 topLayout->addWidget(lVFont->button(),i,2);
1155 ++i; 1161 ++i;
1156 1162
1157 1163
1158 tVFont = 1164 tVFont =
1159 addWidFont(i18n("ToDo"),i18n("ToDoView:"), 1165 addWidFont(i18n("ToDo"),i18n("ToDoView:"),
1160 &(KOPrefs::instance()->mTodoViewFont),topFrame); 1166 &(KOPrefs::instance()->mTodoViewFont),topFrame);
1161 topLayout->addWidget(tVFont->label(),i,0); 1167 topLayout->addWidget(tVFont->label(),i,0);
1162 topLayout->addWidget(tVFont->preview(),i,1); 1168 topLayout->addWidget(tVFont->preview(),i,1);
1163 topLayout->addWidget(tVFont->button(),i,2); 1169 topLayout->addWidget(tVFont->button(),i,2);
1164 ++i; 1170 ++i;
1165 1171
1166 1172
1167 tVFont = 1173 tVFont =
1168 addWidFont(i18n("Today"),i18n("JournalView:"), 1174 addWidFont(i18n("Today"),i18n("JournalView:"),
1169 &(KOPrefs::instance()->mJornalViewFont),topFrame); 1175 &(KOPrefs::instance()->mJornalViewFont),topFrame);
1170 topLayout->addWidget(tVFont->label(),i,0); 1176 topLayout->addWidget(tVFont->label(),i,0);
1171 topLayout->addWidget(tVFont->preview(),i,1); 1177 topLayout->addWidget(tVFont->preview(),i,1);
1172 topLayout->addWidget(tVFont->button(),i,2); 1178 topLayout->addWidget(tVFont->button(),i,2);
1173 ++i; 1179 ++i;
1174 1180
1175 1181
1176 1182
1177 1183
1178 topLayout->setColStretch(1,1); 1184 topLayout->setColStretch(1,1);
1179 topLayout->setRowStretch(4,1); 1185 topLayout->setRowStretch(4,1);
1180 1186
1181 1187
1182 1188
1183 1189
1184} 1190}
1185 1191
1186void KOPrefsDialog::setupColorsTab() 1192void KOPrefsDialog::setupColorsTab()
1187{ 1193{
1188 QFrame *topFrame = addPage(i18n("Colors"),0,0); 1194 QFrame *topFrame = addPage(i18n("Colors"),0,0);
1189 // DesktopIcon("colorize",KIcon::SizeMedium)); 1195 // DesktopIcon("colorize",KIcon::SizeMedium));
1190 1196
1191 QGridLayout *topLayout = new QGridLayout(topFrame,5,2); 1197 QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
1192 // topLayout->setSpacing(spacingHint()); 1198 // topLayout->setSpacing(mSpacingHint);
1193 // topLayout->setMargin(marginHint()); 1199 // topLayout->setMargin(mMarginHint);
1194 1200
1195 topLayout->setSpacing(2); 1201 topLayout->setSpacing(2);
1196 topLayout->setMargin(3); 1202 topLayout->setMargin(3);
1197 1203
1198 int ii = 1; 1204 int ii = 1;
1199 QGroupBox *categoryGroup ; 1205 QGroupBox *categoryGroup ;
1200 1206
1201 categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"), 1207 categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"),
1202 topFrame); 1208 topFrame);
1203 topLayout->addMultiCellWidget(categoryGroup,0,0,0,1); 1209 topLayout->addMultiCellWidget(categoryGroup,0,0,0,1);
1204 1210
1205 mCategoryCombo = new QComboBox(categoryGroup); 1211 mCategoryCombo = new QComboBox(categoryGroup);
1206 mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); 1212 mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
1207 connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor())); 1213 connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor()));
1208 1214
1209 mCategoryButton = new KColorButton(categoryGroup); 1215 mCategoryButton = new KColorButton(categoryGroup);
1210 connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor())); 1216 connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor()));
1211 updateCategoryColor(); 1217 updateCategoryColor();
1212 1218
1213 1219
1214 // Holiday Color 1220 // Holiday Color
1215 1221
1216 KPrefsDialogWidColor *holidayColor = 1222 KPrefsDialogWidColor *holidayColor =
1217 addWidColor(i18n("Holiday color:"), 1223 addWidColor(i18n("Holiday color:"),
1218 &(KOPrefs::instance()->mHolidayColor),topFrame); 1224 &(KOPrefs::instance()->mHolidayColor),topFrame);
1219 topLayout->addWidget(holidayColor->label(),ii,0); 1225 topLayout->addWidget(holidayColor->label(),ii,0);
1220 topLayout->addWidget(holidayColor->button(),ii++,1); 1226 topLayout->addWidget(holidayColor->button(),ii++,1);
1221 1227
1222 // Highlight Color 1228 // Highlight Color
1223 KPrefsDialogWidColor *highlightColor = 1229 KPrefsDialogWidColor *highlightColor =
1224 addWidColor(i18n("Highlight color:"), 1230 addWidColor(i18n("Highlight color:"),
1225 &(KOPrefs::instance()->mHighlightColor),topFrame); 1231 &(KOPrefs::instance()->mHighlightColor),topFrame);
1226 topLayout->addWidget(highlightColor->label(),ii,0); 1232 topLayout->addWidget(highlightColor->label(),ii,0);
1227 topLayout->addWidget(highlightColor->button(),ii++,1); 1233 topLayout->addWidget(highlightColor->button(),ii++,1);
1228 1234
1229 // Event color 1235 // Event color
1230 KPrefsDialogWidColor *eventColor = 1236 KPrefsDialogWidColor *eventColor =
1231 addWidColor(i18n("Default event color:"), 1237 addWidColor(i18n("Default event color:"),
1232 &(KOPrefs::instance()->mEventColor),topFrame); 1238 &(KOPrefs::instance()->mEventColor),topFrame);
1233 topLayout->addWidget(eventColor->label(),ii,0); 1239 topLayout->addWidget(eventColor->label(),ii,0);
1234 topLayout->addWidget(eventColor->button(),ii++,1); 1240 topLayout->addWidget(eventColor->button(),ii++,1);
1235 eventColor = 1241 eventColor =
1236 addWidColor(i18n("Default todo done color:"), 1242 addWidColor(i18n("Default todo done color:"),
1237 &(KOPrefs::instance()->mTodoDoneColor),topFrame); 1243 &(KOPrefs::instance()->mTodoDoneColor),topFrame);
1238 topLayout->addWidget(eventColor->label(),ii,0); 1244 topLayout->addWidget(eventColor->label(),ii,0);
1239 topLayout->addWidget(eventColor->button(),ii++,1); 1245 topLayout->addWidget(eventColor->button(),ii++,1);
1240 1246
1241 1247
1242 // agenda view background color 1248 // agenda view background color
1243 KPrefsDialogWidColor *agendaBgColor = 1249 KPrefsDialogWidColor *agendaBgColor =
1244 addWidColor(i18n("Agenda view background color:"), 1250 addWidColor(i18n("Agenda view background color:"),
1245 &(KOPrefs::instance()->mAgendaBgColor),topFrame); 1251 &(KOPrefs::instance()->mAgendaBgColor),topFrame);
1246 topLayout->addWidget(agendaBgColor->label(),ii,0); 1252 topLayout->addWidget(agendaBgColor->label(),ii,0);
1247 topLayout->addWidget(agendaBgColor->button(),ii++,1); 1253 topLayout->addWidget(agendaBgColor->button(),ii++,1);
1248 1254
1249 // working hours color 1255 // working hours color
1250 KPrefsDialogWidColor *workingHoursColor = 1256 KPrefsDialogWidColor *workingHoursColor =
1251 addWidColor(i18n("Working hours color:"), 1257 addWidColor(i18n("Working hours color:"),
1252 &(KOPrefs::instance()->mWorkingHoursColor),topFrame); 1258 &(KOPrefs::instance()->mWorkingHoursColor),topFrame);
1253 topLayout->addWidget(workingHoursColor->label(),ii,0); 1259 topLayout->addWidget(workingHoursColor->label(),ii,0);
1254 topLayout->addWidget(workingHoursColor->button(),ii++,1); 1260 topLayout->addWidget(workingHoursColor->button(),ii++,1);
1255 1261
1256 KPrefsDialogWidBool *sb = 1262 KPrefsDialogWidBool *sb =
1257 addWidBool(i18n("Use colors for application:"), 1263 addWidBool(i18n("Use colors for application:"),
1258 &(KOPrefs::instance()->mUseAppColors),topFrame); 1264 &(KOPrefs::instance()->mUseAppColors),topFrame);
1259 topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 ); 1265 topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 );
1260 1266
1261 ii++; 1267 ii++;
1262 KPrefsDialogWidColor * workingHoursColor1 = 1268 KPrefsDialogWidColor * workingHoursColor1 =
1263 addWidColor(i18n("Buttons, menus, etc.:"), 1269 addWidColor(i18n("Buttons, menus, etc.:"),
1264 &(KOPrefs::instance()->mAppColor1),topFrame); 1270 &(KOPrefs::instance()->mAppColor1),topFrame);
1265 topLayout->addWidget(workingHoursColor1->label(),ii,0); 1271 topLayout->addWidget(workingHoursColor1->label(),ii,0);
1266 topLayout->addWidget(workingHoursColor1->button(),ii++,1); 1272 topLayout->addWidget(workingHoursColor1->button(),ii++,1);
1267 1273
1268 KPrefsDialogWidColor * workingHoursColor2 = 1274 KPrefsDialogWidColor * workingHoursColor2 =
1269 addWidColor(i18n("Frames, labels, etc.:"), 1275 addWidColor(i18n("Frames, labels, etc.:"),
1270 &(KOPrefs::instance()->mAppColor2),topFrame); 1276 &(KOPrefs::instance()->mAppColor2),topFrame);
1271 topLayout->addWidget(workingHoursColor2->label(),ii,0); 1277 topLayout->addWidget(workingHoursColor2->label(),ii,0);
1272 topLayout->addWidget(workingHoursColor2->button(),ii++,1); 1278 topLayout->addWidget(workingHoursColor2->button(),ii++,1);
1273 1279
1274 1280
1275 1281
1276} 1282}
1277 1283
1278void KOPrefsDialog::setCategoryColor() 1284void KOPrefsDialog::setCategoryColor()
1279{ 1285{
1280 mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color())); 1286 mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color()));
1281} 1287}
1282 1288
1283void KOPrefsDialog::updateCategoryColor() 1289void KOPrefsDialog::updateCategoryColor()
1284{ 1290{
1285 QString cat = mCategoryCombo->currentText(); 1291 QString cat = mCategoryCombo->currentText();
1286 QColor *color = mCategoryDict.find(cat); 1292 QColor *color = mCategoryDict.find(cat);
1287 if (!color) { 1293 if (!color) {
1288 color = KOPrefs::instance()->categoryColor(cat); 1294 color = KOPrefs::instance()->categoryColor(cat);
1289 } 1295 }
1290 if (color) { 1296 if (color) {
1291 mCategoryButton->setColor(*color); 1297 mCategoryButton->setColor(*color);
1292 } 1298 }
1293} 1299}
1294 1300
1295void KOPrefsDialog::setupPrinterTab() 1301void KOPrefsDialog::setupPrinterTab()
1296{ 1302{
1297 mPrinterTab = addPage(i18n("Printing"),0, 1303 mPrinterTab = addPage(i18n("Printing"),0,
1298 DesktopIcon("fileprint",KIcon::SizeMedium)); 1304 DesktopIcon("fileprint",KIcon::SizeMedium));
1299 1305
1300 QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2); 1306 QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
1301 topLayout->setSpacing(spacingHint()); 1307 topLayout->setSpacing(mSpacingHint);
1302 topLayout->setMargin(marginHint()); 1308 topLayout->setMargin(mMarginHint);
1303 1309
1304 topLayout->setRowStretch(4,1); 1310 topLayout->setRowStretch(4,1);
1305} 1311}
1306 1312
1307void KOPrefsDialog::setupGroupSchedulingTab() 1313void KOPrefsDialog::setupGroupSchedulingTab()
1308{ 1314{
1309#if 0 1315#if 0
1310 QFrame *topFrame = addPage(i18n("Group Scheduling"),0, 1316 QFrame *topFrame = addPage(i18n("Group Scheduling"),0,
1311 DesktopIcon("personal",KIcon::SizeMedium)); 1317 DesktopIcon("personal",KIcon::SizeMedium));
1312 1318
1313 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 1319 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
1314 topLayout->setSpacing(spacingHint()); 1320 topLayout->setSpacing(mSpacingHint);
1315 topLayout->setMargin(marginHint()); 1321 topLayout->setMargin(mMarginHint);
1316 1322
1317#if 0 1323#if 0
1318 KPrefsDialogWidRadios *schedulerGroup = 1324 KPrefsDialogWidRadios *schedulerGroup =
1319 addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler), 1325 addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler),
1320 topFrame); 1326 topFrame);
1321 schedulerGroup->addRadio("Dummy"); // Only for debugging 1327 schedulerGroup->addRadio("Dummy"); // Only for debugging
1322 schedulerGroup->addRadio(i18n("Mail client")); 1328 schedulerGroup->addRadio(i18n("Mail client"));
1323 1329
1324 topLayout->addMultiCellWidget(schedulerGroup->groupBox(),0,0,0,1); 1330 topLayout->addMultiCellWidget(schedulerGroup->groupBox(),0,0,0,1);
1325#endif 1331#endif
1326 1332
1327 KPrefsDialogWidRadios *sendGroup = 1333 KPrefsDialogWidRadios *sendGroup =
1328 addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend), 1334 addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend),
1329 topFrame); 1335 topFrame);
1330 sendGroup->addRadio(i18n("Send to outbox")); 1336 sendGroup->addRadio(i18n("Send to outbox"));
1331 sendGroup->addRadio(i18n("Send directly")); 1337 sendGroup->addRadio(i18n("Send directly"));
1332 1338
1333 topLayout->addMultiCellWidget(sendGroup->groupBox(),1,1,0,1); 1339 topLayout->addMultiCellWidget(sendGroup->groupBox(),1,1,0,1);
1334 1340
1335 topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1); 1341 topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1);
1336 mAMails = new QListView(topFrame); 1342 mAMails = new QListView(topFrame);
1337 mAMails->addColumn(i18n("Email"),300); 1343 mAMails->addColumn(i18n("Email"),300);
1338 topLayout->addMultiCellWidget(mAMails,3,3,0,1); 1344 topLayout->addMultiCellWidget(mAMails,3,3,0,1);
1339 1345
1340 topLayout->addWidget(new QLabel(i18n("Additional email address:"),topFrame),4,0); 1346 topLayout->addWidget(new QLabel(i18n("Additional email address:"),topFrame),4,0);
1341 aEmailsEdit = new QLineEdit(topFrame); 1347 aEmailsEdit = new QLineEdit(topFrame);
1342 aEmailsEdit->setEnabled(false); 1348 aEmailsEdit->setEnabled(false);
1343 topLayout->addWidget(aEmailsEdit,4,1); 1349 topLayout->addWidget(aEmailsEdit,4,1);
1344 1350
1345 QPushButton *add = new QPushButton(i18n("New"),topFrame,"new"); 1351 QPushButton *add = new QPushButton(i18n("New"),topFrame,"new");
1346 topLayout->addWidget(add,5,0); 1352 topLayout->addWidget(add,5,0);
1347 QPushButton *del = new QPushButton(i18n("Remove"),topFrame,"remove"); 1353 QPushButton *del = new QPushButton(i18n("Remove"),topFrame,"remove");
1348 topLayout->addWidget(del,5,1); 1354 topLayout->addWidget(del,5,1);
1349 1355
1350 //topLayout->setRowStretch(2,1); 1356 //topLayout->setRowStretch(2,1);
1351 connect(add, SIGNAL( clicked() ), this, SLOT(addItem()) ); 1357 connect(add, SIGNAL( clicked() ), this, SLOT(addItem()) );
1352 connect(del, SIGNAL( clicked() ), this, SLOT(removeItem()) ); 1358 connect(del, SIGNAL( clicked() ), this, SLOT(removeItem()) );
1353 connect(aEmailsEdit,SIGNAL( textChanged(const QString&) ), this,SLOT(updateItem())); 1359 connect(aEmailsEdit,SIGNAL( textChanged(const QString&) ), this,SLOT(updateItem()));
1354 connect(mAMails,SIGNAL(selectionChanged(QListViewItem *)),SLOT(updateInput())); 1360 connect(mAMails,SIGNAL(selectionChanged(QListViewItem *)),SLOT(updateInput()));
1355#endif 1361#endif
1356} 1362}
1357 1363
1358void KOPrefsDialog::setupGroupAutomationTab() 1364void KOPrefsDialog::setupGroupAutomationTab()
1359{ 1365{
1360 return; 1366 return;
1361 QFrame *topFrame = addPage(i18n("Group Automation"),0, 1367 QFrame *topFrame = addPage(i18n("Group Automation"),0,
1362 DesktopIcon("personal",KIcon::SizeMedium)); 1368 DesktopIcon("personal",KIcon::SizeMedium));
1363 1369
1364 QGridLayout *topLayout = new QGridLayout(topFrame,5,1); 1370 QGridLayout *topLayout = new QGridLayout(topFrame,5,1);
1365 topLayout->setSpacing(spacingHint()); 1371 topLayout->setSpacing(mSpacingHint);
1366 topLayout->setMargin(marginHint()); 1372 topLayout->setMargin(mMarginHint);
1367 1373
1368 KPrefsDialogWidRadios *autoRefreshGroup = 1374 KPrefsDialogWidRadios *autoRefreshGroup =
1369 addWidRadios(i18n("Auto Send Refresh"), 1375 addWidRadios(i18n("Auto Send Refresh"),
1370 &(KOPrefs::instance()->mIMIPAutoRefresh),topFrame); 1376 &(KOPrefs::instance()->mIMIPAutoRefresh),topFrame);
1371 autoRefreshGroup->addRadio(i18n("Never")); 1377 autoRefreshGroup->addRadio(i18n("Never"));
1372 autoRefreshGroup->addRadio(i18n("If attendee is in addressbook")); 1378 autoRefreshGroup->addRadio(i18n("If attendee is in addressbook"));
1373 //autoRefreshGroup->addRadio(i18n("selected emails")); 1379 //autoRefreshGroup->addRadio(i18n("selected emails"));
1374 topLayout->addMultiCellWidget(autoRefreshGroup->groupBox(),0,0,0,0); 1380 topLayout->addMultiCellWidget(autoRefreshGroup->groupBox(),0,0,0,0);
1375 1381
1376 KPrefsDialogWidRadios *autoInsertGroup = 1382 KPrefsDialogWidRadios *autoInsertGroup =
1377 addWidRadios(i18n("Auto Insert IMIP Replies"), 1383 addWidRadios(i18n("Auto Insert IMIP Replies"),
1378 &(KOPrefs::instance()->mIMIPAutoInsertReply),topFrame); 1384 &(KOPrefs::instance()->mIMIPAutoInsertReply),topFrame);
1379 autoInsertGroup->addRadio(i18n("Never")); 1385 autoInsertGroup->addRadio(i18n("Never"));
1380 autoInsertGroup->addRadio(i18n("If attendee is in addressbook")); 1386 autoInsertGroup->addRadio(i18n("If attendee is in addressbook"));
1381 //autoInsertGroup->addRadio(i18n("selected emails")); 1387 //autoInsertGroup->addRadio(i18n("selected emails"));
1382 topLayout->addMultiCellWidget(autoInsertGroup->groupBox(),1,1,0,0); 1388 topLayout->addMultiCellWidget(autoInsertGroup->groupBox(),1,1,0,0);
1383 1389
1384 KPrefsDialogWidRadios *autoRequestGroup = 1390 KPrefsDialogWidRadios *autoRequestGroup =
1385 addWidRadios(i18n("Auto Insert IMIP Requests"), 1391 addWidRadios(i18n("Auto Insert IMIP Requests"),
1386 &(KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame); 1392 &(KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame);
1387 autoRequestGroup->addRadio(i18n("Never")); 1393 autoRequestGroup->addRadio(i18n("Never"));
1388 autoRequestGroup->addRadio(i18n("If organizer is in addressbook")); 1394 autoRequestGroup->addRadio(i18n("If organizer is in addressbook"));
1389 //autoInsertGroup->addRadio(i18n("selected emails")); 1395 //autoInsertGroup->addRadio(i18n("selected emails"));
1390 topLayout->addMultiCellWidget(autoRequestGroup->groupBox(),2,2,0,0); 1396 topLayout->addMultiCellWidget(autoRequestGroup->groupBox(),2,2,0,0);
1391 1397
1392 KPrefsDialogWidRadios *autoFreeBusyGroup = 1398 KPrefsDialogWidRadios *autoFreeBusyGroup =
1393 addWidRadios(i18n("Auto Send FreeBusy Information"), 1399 addWidRadios(i18n("Auto Send FreeBusy Information"),
1394 &(KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame); 1400 &(KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame);
1395 autoFreeBusyGroup->addRadio(i18n("Never")); 1401 autoFreeBusyGroup->addRadio(i18n("Never"));
1396 autoFreeBusyGroup->addRadio(i18n("If requested from an email in addressbook")); 1402 autoFreeBusyGroup->addRadio(i18n("If requested from an email in addressbook"));
1397 //autoFreeBusyGroup->addRadio(i18n("selected emails")); 1403 //autoFreeBusyGroup->addRadio(i18n("selected emails"));
1398 topLayout->addMultiCellWidget(autoFreeBusyGroup->groupBox(),3,3,0,0); 1404 topLayout->addMultiCellWidget(autoFreeBusyGroup->groupBox(),3,3,0,0);
1399 1405
1400 KPrefsDialogWidRadios *autoFreeBusyReplyGroup = 1406 KPrefsDialogWidRadios *autoFreeBusyReplyGroup =
1401 addWidRadios(i18n("Auto Save FreeBusy Replies"), 1407 addWidRadios(i18n("Auto Save FreeBusy Replies"),
1402 &(KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame); 1408 &(KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame);
1403 autoFreeBusyReplyGroup->addRadio(i18n("Never")); 1409 autoFreeBusyReplyGroup->addRadio(i18n("Never"));
1404 autoFreeBusyReplyGroup->addRadio(i18n("If attendee is in addressbook")); 1410 autoFreeBusyReplyGroup->addRadio(i18n("If attendee is in addressbook"));
1405 //autoFreeBusyGroup->addRadio(i18n("selected emails")); 1411 //autoFreeBusyGroup->addRadio(i18n("selected emails"));
1406 topLayout->addMultiCellWidget(autoFreeBusyReplyGroup->groupBox(),4,4,0,0); 1412 topLayout->addMultiCellWidget(autoFreeBusyReplyGroup->groupBox(),4,4,0,0);
1407} 1413}
1408 1414
1409void KOPrefsDialog::showPrinterTab() 1415void KOPrefsDialog::showPrinterTab()
1410{ 1416{
1411 showPage(pageIndex(mPrinterTab)); 1417 showPage(pageIndex(mPrinterTab));
1412} 1418}
1413 1419
1414 1420
1415void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text, 1421void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text,
1416 const QStringList *tags) 1422 const QStringList *tags)
1417{ 1423{
1418 if (tags) { 1424 if (tags) {
1419 int i = tags->findIndex(text); 1425 int i = tags->findIndex(text);
1420 if (i > 0) combo->setCurrentItem(i); 1426 if (i > 0) combo->setCurrentItem(i);
1421 } else { 1427 } else {
1422 for(int i=0;i<combo->count();++i) { 1428 for(int i=0;i<combo->count();++i) {
1423 if (combo->text(i) == text) { 1429 if (combo->text(i) == text) {
1424 combo->setCurrentItem(i); 1430 combo->setCurrentItem(i);
1425 break; 1431 break;
1426 } 1432 }
1427 } 1433 }
1428 } 1434 }
1429} 1435}
1430 1436
@@ -1600,122 +1606,122 @@ void KOPrefsDialog::addItem()
1600// aEmailsEdit->setText(i18n("(EmptyEmail)")); 1606// aEmailsEdit->setText(i18n("(EmptyEmail)"));
1601} 1607}
1602 1608
1603void KOPrefsDialog::removeItem() 1609void KOPrefsDialog::removeItem()
1604{ 1610{
1605// QListViewItem *item; 1611// QListViewItem *item;
1606// item = mAMails->selectedItem(); 1612// item = mAMails->selectedItem();
1607// if (!item) return; 1613// if (!item) return;
1608// mAMails->takeItem(item); 1614// mAMails->takeItem(item);
1609// item = mAMails->selectedItem(); 1615// item = mAMails->selectedItem();
1610// if (!item) { 1616// if (!item) {
1611// aEmailsEdit->setText(""); 1617// aEmailsEdit->setText("");
1612// aEmailsEdit->setEnabled(false); 1618// aEmailsEdit->setEnabled(false);
1613// } 1619// }
1614// if (mAMails->childCount() == 0) { 1620// if (mAMails->childCount() == 0) {
1615// aEmailsEdit->setEnabled(false); 1621// aEmailsEdit->setEnabled(false);
1616// } 1622// }
1617} 1623}
1618 1624
1619void KOPrefsDialog::updateItem() 1625void KOPrefsDialog::updateItem()
1620{ 1626{
1621 // QListViewItem *item; 1627 // QListViewItem *item;
1622// item = mAMails->selectedItem(); 1628// item = mAMails->selectedItem();
1623// if (!item) return; 1629// if (!item) return;
1624// item->setText(0,aEmailsEdit->text()); 1630// item->setText(0,aEmailsEdit->text());
1625} 1631}
1626 1632
1627void KOPrefsDialog::updateInput() 1633void KOPrefsDialog::updateInput()
1628{ 1634{
1629// QListViewItem *item; 1635// QListViewItem *item;
1630// item = mAMails->selectedItem(); 1636// item = mAMails->selectedItem();
1631// if (!item) return; 1637// if (!item) return;
1632// aEmailsEdit->setEnabled(true); 1638// aEmailsEdit->setEnabled(true);
1633// aEmailsEdit->setText(item->text(0)); 1639// aEmailsEdit->setText(item->text(0));
1634} 1640}
1635void KOPrefsDialog::updateTimezoneOffset( int index ) 1641void KOPrefsDialog::updateTimezoneOffset( int index )
1636{ 1642{
1637 /* 1643 /*
1638 qDebug("updateTimezoneOffset %d ", index); 1644 qDebug("updateTimezoneOffset %d ", index);
1639 if ( index < 24 ) { 1645 if ( index < 24 ) {
1640 mTimezoneOffsetSpin->setEnabled ( false ); 1646 mTimezoneOffsetSpin->setEnabled ( false );
1641 mTimezoneOffsetSpin->setValue( ( index-11 ) * 60 ); 1647 mTimezoneOffsetSpin->setValue( ( index-11 ) * 60 );
1642 1648
1643 1649
1644 } else { 1650 } else {
1645 if ( index == 24 ) { 1651 if ( index == 24 ) {
1646 mTimezoneOffsetSpin->setEnabled ( true ); 1652 mTimezoneOffsetSpin->setEnabled ( true );
1647 mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); 1653 mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset);
1648 1654
1649 } else { 1655 } else {
1650 mTimezoneOffsetSpin->setEnabled ( false ); 1656 mTimezoneOffsetSpin->setEnabled ( false );
1651 mTimezoneOffsetSpin->setValue( 0 ); 1657 mTimezoneOffsetSpin->setValue( 0 );
1652 } 1658 }
1653 } 1659 }
1654 */ 1660 */
1655} 1661}
1656 1662
1657void KOPrefsDialog::setupTimeZoneTab() 1663void KOPrefsDialog::setupTimeZoneTab()
1658{ 1664{
1659#if 0 1665#if 0
1660 QFrame *topFrame = addPage(i18n("Time Zone"),0,0); 1666 QFrame *topFrame = addPage(i18n("Time Zone"),0,0);
1661 // DesktopIcon("clock",KIcon::SizeMedium)); 1667 // DesktopIcon("clock",KIcon::SizeMedium));
1662 1668
1663 QGridLayout *topLayout = new QGridLayout(topFrame,5,2); 1669 QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
1664 topLayout->setSpacing(spacingHint()); 1670 topLayout->setSpacing(mSpacingHint);
1665 topLayout->setMargin(marginHint()); 1671 topLayout->setMargin(mMarginHint);
1666 1672
1667 QHBox *timeZoneBox = new QHBox( topFrame ); 1673 QHBox *timeZoneBox = new QHBox( topFrame );
1668 topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); 1674 topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
1669 1675
1670 new QLabel( i18n("Timezone:"), timeZoneBox ); 1676 new QLabel( i18n("Timezone:"), timeZoneBox );
1671 mTimeZoneCombo = new QComboBox( timeZoneBox ); 1677 mTimeZoneCombo = new QComboBox( timeZoneBox );
1672 if ( QApplication::desktop()->width() < 300 ) { 1678 if ( QApplication::desktop()->width() < 300 ) {
1673 mTimeZoneCombo->setMaximumWidth(150); 1679 mTimeZoneCombo->setMaximumWidth(150);
1674 } 1680 }
1675 1681
1676 QStringList list; 1682 QStringList list;
1677 list = KGlobal::locale()->timeZoneList(); 1683 list = KGlobal::locale()->timeZoneList();
1678 mTimeZoneCombo->insertStringList(list); 1684 mTimeZoneCombo->insertStringList(list);
1679 1685
1680 // find the currently set time zone and select it 1686 // find the currently set time zone and select it
1681 QString sCurrentlySet = KOPrefs::instance()->mTimeZoneId; 1687 QString sCurrentlySet = KOPrefs::instance()->mTimeZoneId;
1682 int nCurrentlySet = 11; 1688 int nCurrentlySet = 11;
1683 for (int i = 0; i < mTimeZoneCombo->count(); i++) 1689 for (int i = 0; i < mTimeZoneCombo->count(); i++)
1684 { 1690 {
1685 if (mTimeZoneCombo->text(i) == sCurrentlySet) 1691 if (mTimeZoneCombo->text(i) == sCurrentlySet)
1686 { 1692 {
1687 nCurrentlySet = i; 1693 nCurrentlySet = i;
1688 break; 1694 break;
1689 } 1695 }
1690 } 1696 }
1691 mTimeZoneCombo->setCurrentItem(nCurrentlySet); 1697 mTimeZoneCombo->setCurrentItem(nCurrentlySet);
1692 int iii = 1; 1698 int iii = 1;
1693 KPrefsDialogWidBool *sb = 1699 KPrefsDialogWidBool *sb =
1694 addWidBool(i18n("Timezone has daylight saving"), 1700 addWidBool(i18n("Timezone has daylight saving"),
1695 &(KOPrefs::instance()->mUseDaylightsaving),topFrame); 1701 &(KOPrefs::instance()->mUseDaylightsaving),topFrame);
1696 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 1702 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
1697 ++iii; 1703 ++iii;
1698 QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); 1704 QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame );
1699 topLayout->addMultiCellWidget(lab, iii,iii,0,1); 1705 topLayout->addMultiCellWidget(lab, iii,iii,0,1);
1700 ++iii; 1706 ++iii;
1701 lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); 1707 lab = new QLabel( i18n("The year in the date is ignored."), topFrame );
1702 topLayout->addMultiCellWidget(lab, iii,iii,0,1); 1708 topLayout->addMultiCellWidget(lab, iii,iii,0,1);
1703 ++iii; 1709 ++iii;
1704 lab = new QLabel( i18n("Daylight start:"), topFrame ); 1710 lab = new QLabel( i18n("Daylight start:"), topFrame );
1705 topLayout->addWidget(lab, iii,0); 1711 topLayout->addWidget(lab, iii,0);
1706 mStartDateSavingEdit = new KDateEdit(topFrame); 1712 mStartDateSavingEdit = new KDateEdit(topFrame);
1707 topLayout->addWidget(mStartDateSavingEdit, iii,1); 1713 topLayout->addWidget(mStartDateSavingEdit, iii,1);
1708 ++iii; 1714 ++iii;
1709 1715
1710 lab = new QLabel( i18n("Daylight end:"), topFrame ); 1716 lab = new QLabel( i18n("Daylight end:"), topFrame );
1711 topLayout->addWidget(lab, iii,0); 1717 topLayout->addWidget(lab, iii,0);
1712 mEndDateSavingEdit = new KDateEdit(topFrame); 1718 mEndDateSavingEdit = new KDateEdit(topFrame);
1713 topLayout->addWidget(mEndDateSavingEdit, iii,1); 1719 topLayout->addWidget(mEndDateSavingEdit, iii,1);
1714 ++iii; 1720 ++iii;
1715 QDate current ( 2001, 1,1); 1721 QDate current ( 2001, 1,1);
1716 mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); 1722 mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
1717 mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); 1723 mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1));
1718#endif 1724#endif
1719 1725
1720} 1726}
1721 1727
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index e20969a..6892028 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -98,67 +98,69 @@ class KOPrefsDialog : public KPrefsDialog
98 void setupSyncAlgTab(); 98 void setupSyncAlgTab();
99 99
100 void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); 100 void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0);
101 101
102 102
103 private: 103 private:
104 KDEPIMConfigWidget* kdelibcfg; 104 KDEPIMConfigWidget* kdelibcfg;
105 KPrefsDialogWidBool *mEnableGroupScheduling; 105 KPrefsDialogWidBool *mEnableGroupScheduling;
106 KPrefsDialogWidBool *mEnableProjectView; 106 KPrefsDialogWidBool *mEnableProjectView;
107 107
108 QFrame *mPrinterTab; 108 QFrame *mPrinterTab;
109 109
110 QLineEdit *nameEdit; 110 QLineEdit *nameEdit;
111 QLineEdit *emailEdit; 111 QLineEdit *emailEdit;
112 112
113 QComboBox *timeCombo; 113 QComboBox *timeCombo;
114 QComboBox *tzCombo; 114 QComboBox *tzCombo;
115 115
116 // widgets holding preferences data 116 // widgets holding preferences data
117 QLineEdit *mNameEdit; 117 QLineEdit *mNameEdit;
118 QLineEdit *mEmailEdit; 118 QLineEdit *mEmailEdit;
119 QLabel *mNameLabel; 119 QLabel *mNameLabel;
120 QLabel *mEmailLabel; 120 QLabel *mEmailLabel;
121 QLineEdit *mAdditionalEdit; 121 QLineEdit *mAdditionalEdit;
122 QSpinBox *mAutoSaveIntervalSpin; 122 QSpinBox *mAutoSaveIntervalSpin;
123 QSpinBox *mPrioSpin; 123 QSpinBox *mPrioSpin;
124 // QListView *mAMails; 124 // QListView *mAMails;
125 QLineEdit *aEmailsEdit; 125 QLineEdit *aEmailsEdit;
126 126
127 QComboBox *mTimeZoneCombo; 127 QComboBox *mTimeZoneCombo;
128 QStringList tzonenames; 128 QStringList tzonenames;
129 QSpinBox *mStartTimeSpin; 129 QSpinBox *mStartTimeSpin;
130 QSpinBox *mDefaultDurationSpin; 130 QSpinBox *mDefaultDurationSpin;
131 QComboBox *mAlarmTimeCombo; 131 QComboBox *mAlarmTimeCombo;
132 132
133 QComboBox *mCategoryCombo; 133 QComboBox *mCategoryCombo;
134 KColorButton *mCategoryButton; 134 KColorButton *mCategoryButton;
135 QDict<QColor> mCategoryDict; 135 QDict<QColor> mCategoryDict;
136 136
137 QSlider *mHourSizeSlider; 137 QSlider *mHourSizeSlider;
138 138
139 QSpinBox *mNextXDaysSpin; 139 QSpinBox *mNextXDaysSpin;
140 QSpinBox *mWhatsNextSpin; 140 QSpinBox *mWhatsNextSpin;
141 141
142 QLineEdit * mRemoteIPEdit; 142 QLineEdit * mRemoteIPEdit;
143 QLineEdit * mRemoteUser; 143 QLineEdit * mRemoteUser;
144 QLineEdit * mRemotePassWd; 144 QLineEdit * mRemotePassWd;
145 QLineEdit * mRemoteFile; 145 QLineEdit * mRemoteFile;
146 QLineEdit * mLocalTempFile; 146 QLineEdit * mLocalTempFile;
147 QWidget* mSetupSyncAlgTab; 147 QWidget* mSetupSyncAlgTab;
148 QLineEdit * mUserDateFormatLong; 148 QLineEdit * mUserDateFormatLong;
149 QLineEdit * mUserDateFormatShort; 149 QLineEdit * mUserDateFormatShort;
150 150
151 QSpinBox *mTimezoneOffsetSpin; 151 QSpinBox *mTimezoneOffsetSpin;
152 QSpinBox *mDaylightsavingStart; 152 QSpinBox *mDaylightsavingStart;
153 QSpinBox *mDaylightsavingEnd; 153 QSpinBox *mDaylightsavingEnd;
154 KDateEdit* mStartDateSavingEdit; 154 KDateEdit* mStartDateSavingEdit;
155 KDateEdit* mEndDateSavingEdit; 155 KDateEdit* mEndDateSavingEdit;
156 QSpinBox * mAlarmPlayBeeps; 156 QSpinBox * mAlarmPlayBeeps;
157 QSpinBox * mAlarmSuspendTime; 157 QSpinBox * mAlarmSuspendTime;
158 QSpinBox * mAlarmSuspendCount; 158 QSpinBox * mAlarmSuspendCount;
159 QSpinBox * mAlarmBeepInterval; 159 QSpinBox * mAlarmBeepInterval;
160 160
161 QLineEdit * mDefaultAlarmFile; 161 QLineEdit * mDefaultAlarmFile;
162 int mSpacingHint;
163 int mMarginHint;
162}; 164};
163 165
164#endif 166#endif
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 0610d55..b03870f 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -155,125 +155,125 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
155 mNextMonth->setFocusPolicy(NoFocus); 155 mNextMonth->setFocusPolicy(NoFocus);
156 mPrevWeek->setFocusPolicy(NoFocus); 156 mPrevWeek->setFocusPolicy(NoFocus);
157 mNextWeek->setFocusPolicy(NoFocus); 157 mNextWeek->setFocusPolicy(NoFocus);
158 mNextYear->setFocusPolicy(NoFocus); 158 mNextYear->setFocusPolicy(NoFocus);
159 mSelectMonth->setFocusPolicy(NoFocus); 159 mSelectMonth->setFocusPolicy(NoFocus);
160 setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); 160 setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) );
161 161
162} 162}
163 163
164NavigatorBar::~NavigatorBar() 164NavigatorBar::~NavigatorBar()
165{ 165{
166} 166}
167QSize NavigatorBar::sizeHint() const 167QSize NavigatorBar::sizeHint() const
168{ 168{
169 int wid = mCurrentMinWid ; 169 int wid = mCurrentMinWid ;
170 if ( mPrevYear->isVisible() ) 170 if ( mPrevYear->isVisible() )
171 wid += mCurrentButtonMinWid; 171 wid += mCurrentButtonMinWid;
172 if ( mPrevMonth->isVisible() ) 172 if ( mPrevMonth->isVisible() )
173 wid += mCurrentButtonMinWid; 173 wid += mCurrentButtonMinWid;
174 if ( mPrevWeek->isVisible() ) 174 if ( mPrevWeek->isVisible() )
175 wid += mCurrentButtonMinWid; 175 wid += mCurrentButtonMinWid;
176 if ( mNextMonth->isVisible() ) 176 if ( mNextMonth->isVisible() )
177 wid += mCurrentButtonMinWid; 177 wid += mCurrentButtonMinWid;
178 if ( mNextWeek->isVisible() ) 178 if ( mNextWeek->isVisible() )
179 wid += mCurrentButtonMinWid; 179 wid += mCurrentButtonMinWid;
180 if ( mNextYear->isVisible() ) 180 if ( mNextYear->isVisible() )
181 wid += mCurrentButtonMinWid; 181 wid += mCurrentButtonMinWid;
182 //qDebug("ret %d %d ", wid, mCurrentHei); 182 //qDebug("ret %d %d ", wid, mCurrentHei);
183 return QSize ( wid, mCurrentHei ); 183 return QSize ( wid, mCurrentHei );
184} 184}
185QSize NavigatorBar::sizeHintTwoButtons( int butNum ) const 185QSize NavigatorBar::sizeHintTwoButtons( int butNum ) const
186{ 186{
187 return QSize ( mCurrentMinWid + butNum * mCurrentButtonMinWid , mCurrentHei ); 187 return QSize ( mCurrentMinWid + butNum * mCurrentButtonMinWid , mCurrentHei );
188} 188}
189void NavigatorBar::resetFont ( QFont fo ) 189void NavigatorBar::resetFont ( QFont fo )
190{ 190{
191 191
192 QFont tfont = fo; 192 QFont tfont = fo;
193 if ( QApplication::desktop()->width() >= 480 ) 193 if ( QApplication::desktop()->width() >= 480 )
194 tfont.setPointSize(tfont.pointSize()+2); 194 tfont.setPointSize(tfont.pointSize()+2);
195 tfont.setBold(true); 195 tfont.setBold(true);
196 196
197 mSelectMonth->setFont( tfont ); 197 mSelectMonth->setFont( tfont );
198 // Set minimum width to width of widest month name label 198 // Set minimum width to width of widest month name label
199 int i; 199 int i;
200 int maxwidth = 0; 200 int maxwidth = 0;
201 QFontMetrics fm ( mSelectMonth->font() ); 201 QFontMetrics fm ( mSelectMonth->font() );
202 int width = fm.width("September '00" ); 202 int width = fm.width("September '00" );
203 maxwidth = width+2; 203 maxwidth = width+2;
204 int size = fm.height()+2; 204 int size = fm.height()+2;
205 if ( QApplication::desktop()->width() >= 480 ) { 205 if ( QApplication::desktop()->width() >= 480 ) {
206 size += 6; 206 size += 6;
207 maxwidth+= 6; 207 maxwidth+= 6;
208 } 208 }
209 mSelectMonth->setMinimumWidth( maxwidth ); 209 mSelectMonth->setMinimumWidth( maxwidth );
210 mSelectMonth->setFixedHeight( size ); 210 mSelectMonth->setFixedHeight( size );
211 mPrevYear->setFixedHeight( size ); 211 mPrevYear->setFixedHeight( size );
212 mPrevMonth->setFixedHeight( size ); 212 mPrevMonth->setFixedHeight( size );
213 mPrevWeek->setFixedHeight( size ); 213 mPrevWeek->setFixedHeight( size );
214 mNextMonth->setFixedHeight( size ); 214 mNextMonth->setFixedHeight( size );
215 mNextWeek->setFixedHeight( size ); 215 mNextWeek->setFixedHeight( size );
216 mNextYear->setFixedHeight ( size ); 216 mNextYear->setFixedHeight ( size );
217 mCurrentHei = size +2; 217 mCurrentHei = size +2;
218 mCurrentMinWid = maxwidth+2; 218 mCurrentMinWid = maxwidth+2;
219 mCurrentButtonMinWid = mPrevYear->sizeHint().width()+2; 219 mCurrentButtonMinWid = mPrevYear->sizeHint().width();
220} 220}
221 221
222void NavigatorBar::showButtons( bool left, bool right ) 222void NavigatorBar::showButtons( bool left, bool right )
223{ 223{
224 if ( left ) { 224 if ( left ) {
225 mPrevYear->show(); 225 mPrevYear->show();
226 mPrevMonth->show(); 226 mPrevMonth->show();
227 } else { 227 } else {
228 mPrevYear->hide(); 228 mPrevYear->hide();
229 mPrevMonth->hide(); 229 mPrevMonth->hide();
230 } 230 }
231 231
232 if ( right ) { 232 if ( right ) {
233 mNextYear->show(); 233 mNextYear->show();
234 mNextMonth->show(); 234 mNextMonth->show();
235 } else { 235 } else {
236 mNextYear->hide(); 236 mNextYear->hide();
237 mNextMonth->hide(); 237 mNextMonth->hide();
238 } 238 }
239 if ( !left && !right ) { 239 if ( !left && !right ) {
240 //mSelectMonth->setMaximumWidth( 1024 ); 240 //mSelectMonth->setMaximumWidth( 1024 );
241 mSelectMonth->setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); 241 mSelectMonth->setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) );
242 } 242 }
243} 243}
244 244
245void NavigatorBar::selectMonth() 245void NavigatorBar::selectMonth()
246{ 246{
247 247
248 int month; 248 int month;
249 KPopupFrame* popup = new KPopupFrame(this); 249 KPopupFrame* popup = new KPopupFrame(this);
250 KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(popup); 250 KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(popup);
251 // ----- 251 // -----
252 picker->resize(picker->sizeHint()); 252 picker->resize(picker->sizeHint());
253 popup->setMainWidget(picker); 253 popup->setMainWidget(picker);
254 picker->setFocus(); 254 picker->setFocus();
255 connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); 255 connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
256 if(popup->exec(mSelectMonth->mapToGlobal(QPoint(0, mSelectMonth->height())))) 256 if(popup->exec(mSelectMonth->mapToGlobal(QPoint(0, mSelectMonth->height()))))
257 { 257 {
258 month = picker->getResult(); 258 month = picker->getResult();
259 emit monthSelected ( month ); 259 emit monthSelected ( month );
260 } else { 260 } else {
261 KNotifyClient::beep(); 261 KNotifyClient::beep();
262 } 262 }
263 delete popup; 263 delete popup;
264} 264}
265void NavigatorBar::selectDates( const KCal::DateList &dateList ) 265void NavigatorBar::selectDates( const KCal::DateList &dateList )
266{ 266{
267 if (dateList.count() > 0) { 267 if (dateList.count() > 0) {
268 QDate date = dateList.first(); 268 QDate date = dateList.first();
269 269
270 const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem(); 270 const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem();
271 271
272 // compute the label at the top of the navigator 272 // compute the label at the top of the navigator
273 QString dtstr = i18n(calSys->monthName( date )) + " '" + 273 QString dtstr = i18n(calSys->monthName( date )) + " '" +
274 QString::number( calSys->year( date ) ).right(2); 274 QString::number( calSys->year( date ) ).right(2);
275 275
276 mSelectMonth->setText( dtstr ); 276 mSelectMonth->setText( dtstr );
277 } 277 }
278} 278}
279 279
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 4fe1e66..d62d9f9 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -145,129 +145,129 @@ void KDEPIMConfigWidget::setupStoreTab()
145 pb = new QPushButton ( i18n("Save settings"), bb ); 145 pb = new QPushButton ( i18n("Save settings"), bb );
146 connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) ); 146 connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) );
147 pb = new QPushButton ( i18n("Save standard"), bb ); 147 pb = new QPushButton ( i18n("Save standard"), bb );
148 connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) ); 148 connect(pb, SIGNAL( clicked() ), this, SLOT ( setStandardStore() ) );
149#ifdef DESKTOP_VERSION 149#ifdef DESKTOP_VERSION
150 pb = new QPushButton ( i18n("Save using LOCAL storage"), bb ); 150 pb = new QPushButton ( i18n("Save using LOCAL storage"), bb );
151 connect(pb, SIGNAL( clicked() ), this, SLOT ( setLocalStore() ) ); 151 connect(pb, SIGNAL( clicked() ), this, SLOT ( setLocalStore() ) );
152#endif 152#endif
153 new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage ); 153 new QLabel( i18n("<b>New settings are used\nafter a restart</b>"), storePage );
154 new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage ); 154 new QLabel( i18n("Settings are stored in\n%1").arg(QDir::homeDirPath() + "/.microkdehome" ), storePage );
155 tabWidget->addTab( storePage, i18n( "Data storage path" ) ); 155 tabWidget->addTab( storePage, i18n( "Data storage path" ) );
156} 156}
157void KDEPIMConfigWidget::setLocalStore() 157void KDEPIMConfigWidget::setLocalStore()
158{ 158{
159 mStoreUrl->setURL( "LOCAL:kdepimpi" ); 159 mStoreUrl->setURL( "LOCAL:kdepimpi" );
160 saveStoreSettings(); 160 saveStoreSettings();
161 QString message = i18n("'LOCAL' mode makes is possible to run\nKA/Pi and KO/Pi from a USB memory stick.\nIn LOCAL mode the data is stored\nin a path relative to the executable.\nNote, that in LOCAL mode only addressbook\nresource files in\n <path of the executable>/<dirname after LOCAL:>/apps/kabc/*.vcf\n are supported.\nIf you use the standard addressbook settings\nyou do not have to reconfigure any path,\njust restart the application and import\nyour addressbook and calendar data."); 161 QString message = i18n("'LOCAL' mode makes is possible to run\nKA/Pi and KO/Pi from a USB memory stick.\nIn LOCAL mode the data is stored\nin a path relative to the executable.\nNote, that in LOCAL mode only addressbook\nresource files in\n <path of the executable>/<dirname after LOCAL:>/apps/kabc/*.vcf\n are supported.\nIf you use the standard addressbook settings\nyou do not have to reconfigure any path,\njust restart the application and import\nyour addressbook and calendar data.");
162 KMessageBox::information( this, message); 162 KMessageBox::information( this, message);
163} 163}
164void KDEPIMConfigWidget::setStandardStore() 164void KDEPIMConfigWidget::setStandardStore()
165{ 165{
166 mStoreUrl->setURL( QDir::homeDirPath() + "/kdepim" ); 166 mStoreUrl->setURL( QDir::homeDirPath() + "/kdepim" );
167 saveStoreSettings(); 167 saveStoreSettings();
168} 168}
169void KDEPIMConfigWidget::saveStoreSettings() 169void KDEPIMConfigWidget::saveStoreSettings()
170{ 170{
171 if ( !mStoreUrl->url().isEmpty() ) { 171 if ( !mStoreUrl->url().isEmpty() ) {
172 QString path = QDir::homeDirPath(); 172 QString path = QDir::homeDirPath();
173 QString url = mStoreUrl->url(); 173 QString url = mStoreUrl->url();
174#ifdef DESKTOP_VERSION 174#ifdef DESKTOP_VERSION
175 if ( url.startsWith( "LOCAL:" ) ) { 175 if ( url.startsWith( "LOCAL:" ) ) {
176 path = qApp->applicationDirPath () ; 176 path = qApp->applicationDirPath () ;
177 } 177 }
178#endif 178#endif
179 KConfig cfg ( path + "/.microkdehome" ); 179 KConfig cfg ( path + "/.microkdehome" );
180 cfg.setGroup("Global"); 180 cfg.setGroup("Global");
181 cfg.writeEntry( "MICROKDEHOME", url ); 181 cfg.writeEntry( "MICROKDEHOME", url );
182 qDebug("cfg.writeEntry( MICROKDEHOME, %s ", url.latin1()); 182 qDebug("cfg.writeEntry( MICROKDEHOME, %s ", url.latin1());
183 cfg.sync(); 183 cfg.sync();
184 } else { 184 } else {
185 mStoreUrl->setURL( QDir::homeDirPath() + "/kdepim" ); 185 mStoreUrl->setURL( QDir::homeDirPath() + "/kdepim" );
186 saveStoreSettings(); 186 saveStoreSettings();
187 } 187 }
188} 188}
189void KDEPIMConfigWidget::setupExternalAppTab() 189void KDEPIMConfigWidget::setupExternalAppTab()
190{ 190{
191 QWidget *externalAppsPage = new QWidget( this ); 191 QWidget *externalAppsPage = new QWidget( this );
192 QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(), 192 QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
193 KDialog::spacingHintSmall() ); 193 KDialog::spacingHintSmall() );
194 194
195 mExternalApps = new QComboBox( externalAppsPage ); 195 mExternalApps = new QComboBox( externalAppsPage );
196 196
197 QMap<ExternalAppHandler::Types, QString>::Iterator it; 197 QMap<ExternalAppHandler::Types, QString>::Iterator it;
198 for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it ) 198 for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it )
199 mExternalApps->insertItem( it.data(), it.key() ); 199 mExternalApps->insertItem( it.data(), it.key() );
200 200
201 layout->addWidget( mExternalApps ); 201 layout->addWidget( mExternalApps );
202 202
203 connect( mExternalApps, SIGNAL( activated( int ) ), 203 connect( mExternalApps, SIGNAL( activated( int ) ),
204 this, SLOT (externalapp_changed( int ) ) ); 204 this, SLOT (externalapp_changed( int ) ) );
205 205
206 206
207 mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); 207 mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
208 QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); 208 QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" );
209 mExternalAppGroupBox->layout()->setMargin(5); 209 mExternalAppGroupBox->layout()->setMargin(4);
210 210
211 mClient = new QComboBox( mExternalAppGroupBox ); 211 mClient = new QComboBox( mExternalAppGroupBox );
212 boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); 212 boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
213 213
214 connect( mClient, SIGNAL( activated( int ) ), 214 connect( mClient, SIGNAL( activated( int ) ),
215 this, SLOT (client_changed( int ) ) ); 215 this, SLOT (client_changed( int ) ) );
216 216
217 QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox); 217 QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox);
218 boxLayout->addWidget( lab, 1, 0 ); 218 boxLayout->addWidget( lab, 1, 0 );
219 mChannel = new QLineEdit(mExternalAppGroupBox); 219 mChannel = new QLineEdit(mExternalAppGroupBox);
220 mChannel->setReadOnly(true); 220 mChannel->setReadOnly(true);
221 boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 ); 221 boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 );
222 222
223 lab = new QLabel( i18n("Message:"), mExternalAppGroupBox); 223 lab = new QLabel( i18n("Message:"), mExternalAppGroupBox);
224 boxLayout->addWidget( lab, 3, 0 ); 224 boxLayout->addWidget( lab, 3, 0 );
225 mMessage = new QLineEdit(mExternalAppGroupBox); 225 mMessage = new QLineEdit(mExternalAppGroupBox);
226 mMessage->setReadOnly(true); 226 mMessage->setReadOnly(true);
227 boxLayout->addWidget( mMessage , 4, 0); 227 boxLayout->addWidget( mMessage , 4, 0);
228 228
229 lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox); 229 lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox);
230 boxLayout->addWidget( lab, 3, 1 ); 230 boxLayout->addWidget( lab, 3, 1 );
231 mParameters = new QLineEdit(mExternalAppGroupBox); 231 mParameters = new QLineEdit(mExternalAppGroupBox);
232 mParameters->setReadOnly(true); 232 mParameters->setReadOnly(true);
233 boxLayout->addWidget( mParameters, 4, 1 ); 233 boxLayout->addWidget( mParameters, 4, 1 );
234 234
235 lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); 235 lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
236 boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); 236 boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
237 237
238 238
239 lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); 239 lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
240 boxLayout->addWidget( lab, 6, 0 ); 240 boxLayout->addWidget( lab, 6, 0 );
241 mMessage2 = new QLineEdit(mExternalAppGroupBox); 241 mMessage2 = new QLineEdit(mExternalAppGroupBox);
242 mMessage2->setReadOnly(true); 242 mMessage2->setReadOnly(true);
243 boxLayout->addWidget( mMessage2 , 7, 0); 243 boxLayout->addWidget( mMessage2 , 7, 0);
244 244
245 lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox); 245 lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
246 boxLayout->addWidget( lab, 6, 1 ); 246 boxLayout->addWidget( lab, 6, 1 );
247 mParameters2 = new QLineEdit(mExternalAppGroupBox); 247 mParameters2 = new QLineEdit(mExternalAppGroupBox);
248 mParameters2->setReadOnly(true); 248 mParameters2->setReadOnly(true);
249 boxLayout->addWidget( mParameters2, 7, 1 ); 249 boxLayout->addWidget( mParameters2, 7, 1 );
250 250
251 lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox); 251 lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
252 boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 ); 252 boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 );
253 253
254 254
255 connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 255 connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
256 connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 256 connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
257 connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 257 connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
258 connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 258 connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
259 connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 259 connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
260 260
261 261
262 layout->addWidget( mExternalAppGroupBox ); 262 layout->addWidget( mExternalAppGroupBox );
263 tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) ); 263 tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) );
264 264
265} 265}
266 266
267 267
268void KDEPIMConfigWidget::setupLocaleDateTab() 268void KDEPIMConfigWidget::setupLocaleDateTab()
269{ 269{
270 QWidget *topFrame = new QWidget( this ); 270 QWidget *topFrame = new QWidget( this );
271 QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2); 271 QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2);
272 272
273 topLayout->setSpacing(KDialog::spacingHintSmall()); 273 topLayout->setSpacing(KDialog::spacingHintSmall());
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index ea3a329..d675517 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -617,146 +617,154 @@ void KDGanttMinimizeSplitter::childEvent( QChildEvent *c )
617 addWidget( (QWidget*)c->child() ); 617 addWidget( (QWidget*)c->child() );
618 recalc( isVisible() ); 618 recalc( isVisible() );
619 619
620 } else if ( c->type() == QEvent::ChildRemoved ) { 620 } else if ( c->type() == QEvent::ChildRemoved ) {
621 QSplitterLayoutStruct *p = 0; 621 QSplitterLayoutStruct *p = 0;
622 if ( data->list.count() > 1 ) 622 if ( data->list.count() > 1 )
623 p = data->list.at(1); //remove handle _after_ first widget. 623 p = data->list.at(1); //remove handle _after_ first widget.
624 QSplitterLayoutStruct *s = data->list.first(); 624 QSplitterLayoutStruct *s = data->list.first();
625 while ( s ) { 625 while ( s ) {
626 if ( s->wid == c->child() ) { 626 if ( s->wid == c->child() ) {
627 data->list.removeRef( s ); 627 data->list.removeRef( s );
628 delete s; 628 delete s;
629 if ( p && p->isSplitter ) { 629 if ( p && p->isSplitter ) {
630 data->list.removeRef( p ); 630 data->list.removeRef( p );
631 delete p->wid; //will call childEvent 631 delete p->wid; //will call childEvent
632 delete p; 632 delete p;
633 } 633 }
634 recalcId(); 634 recalcId();
635 doResize(); 635 doResize();
636 return; 636 return;
637 } 637 }
638 p = s; 638 p = s;
639 s = data->list.next(); 639 s = data->list.next();
640 } 640 }
641 } 641 }
642} 642}
643 643
644 644
645/*! 645/*!
646 Shows a rubber band at position \a p. If \a p is negative, the 646 Shows a rubber band at position \a p. If \a p is negative, the
647 rubber band is removed. 647 rubber band is removed.
648*/ 648*/
649void KDGanttMinimizeSplitter::setRubberband( int p ) 649void KDGanttMinimizeSplitter::setRubberband( int p )
650{ 650{
651#ifdef DESKTOP_VERSION 651#ifdef DESKTOP_VERSION
652 QPainter paint( this ); 652 QPainter paint( this );
653 paint.setPen( gray ); 653 paint.setPen( gray );
654 paint.setBrush( gray ); 654 paint.setBrush( gray );
655 paint.setRasterOp( XorROP ); 655 paint.setRasterOp( XorROP );
656 QRect r = contentsRect(); 656 QRect r = contentsRect();
657 const int rBord = 3; //Themable???? 657 const int rBord = 3; //Themable????
658#if QT_VERSION >= 0x030000 658#if QT_VERSION >= 0x030000
659 int sw = style().pixelMetric(QStyle::PM_SplitterWidth, this); 659 int sw = style().pixelMetric(QStyle::PM_SplitterWidth, this);
660#else 660#else
661 int sw = style().splitterWidth(); 661 int sw = style().splitterWidth();
662#endif 662#endif
663 if ( orient == Horizontal ) { 663 if ( orient == Horizontal ) {
664 if ( opaqueOldPos >= 0 ) 664 if ( opaqueOldPos >= 0 )
665 paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(), 665 paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
666 2*rBord, r.height() ); 666 2*rBord, r.height() );
667 if ( p >= 0 ) 667 if ( p >= 0 )
668 paint.drawRect( p + sw/2 - rBord, r.y(), 2*rBord, r.height() ); 668 paint.drawRect( p + sw/2 - rBord, r.y(), 2*rBord, r.height() );
669 } else { 669 } else {
670 if ( opaqueOldPos >= 0 ) 670 if ( opaqueOldPos >= 0 )
671 paint.drawRect( r.x(), opaqueOldPos + sw/2 - rBord, 671 paint.drawRect( r.x(), opaqueOldPos + sw/2 - rBord,
672 r.width(), 2*rBord ); 672 r.width(), 2*rBord );
673 if ( p >= 0 ) 673 if ( p >= 0 )
674 paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord ); 674 paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord );
675 } 675 }
676 opaqueOldPos = p; 676 opaqueOldPos = p;
677#else 677#else
678 if ( !mRubberBand ) { 678 if ( !mRubberBand ) {
679 mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop); 679 mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop);
680 mRubberBand->setFrameStyle( Box | Raised ); 680 mRubberBand->setFrameStyle( Box | Raised );
681 mRubberBand->setPalette( QPalette ( Qt::green.light(),Qt::green.dark() ) ); 681 mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) );
682 } 682 }
683 QRect r = contentsRect(); 683 QRect r = contentsRect();
684 const int rBord = 5; //Themable???? 684 static int rBord = 0; //Themable????
685 if ( !rBord ) {
686 if (QApplication::desktop()->width() <= 320 )
687 rBord = 4;
688 else
689 rBord = 5;
690 }
685 int sw = style().splitterWidth(); 691 int sw = style().splitterWidth();
686 if ( orient == Horizontal ) { 692 if ( orient == Horizontal ) {
687 if ( p >= 0 ) { 693 if ( p >= 0 ) {
688 QPoint geo = mapToGlobal (QPoint ( p + sw/2 - rBord, r.y())); 694 QPoint geo = mapToGlobal (QPoint ( p + sw/2 - rBord, r.y()));
689 mRubberBand->setGeometry( geo.x(), geo.y(), 2*rBord, r.height() ); 695 mRubberBand->setGeometry( geo.x(), geo.y(), 2*rBord, r.height() );
690 } 696 }
691 } else { 697 } else {
692 if ( p >= 0 ) { 698 if ( p >= 0 ) {
693 QPoint geo = mapToGlobal (QPoint ( r.x(), p + sw/2 - rBord)); 699 QPoint geo = mapToGlobal (QPoint ( r.x(), p + sw/2 - rBord));
694 mRubberBand->setGeometry( geo.x(), geo.y(), r.width(), 2*rBord); 700 mRubberBand->setGeometry( geo.x(), geo.y(), r.width(), 2*rBord);
695 } 701 }
696 } 702 }
697 opaqueOldPos = p; 703 opaqueOldPos = p;
698 mRubberBand->show(); 704 if ( ! mRubberBand->isVisible() ) {
705 mRubberBand->show();
706 }
699#endif 707#endif
700} 708}
701 709
702 710
703/*! \reimp */ 711/*! \reimp */
704bool KDGanttMinimizeSplitter::event( QEvent *e ) 712bool KDGanttMinimizeSplitter::event( QEvent *e )
705{ 713{
706 if ( e->type() == QEvent::LayoutHint || ( e->type() == QEvent::Show && data->firstShow ) ) { 714 if ( e->type() == QEvent::LayoutHint || ( e->type() == QEvent::Show && data->firstShow ) ) {
707 recalc( isVisible() ); 715 recalc( isVisible() );
708 if ( e->type() == QEvent::Show ) 716 if ( e->type() == QEvent::Show )
709 data->firstShow = FALSE; 717 data->firstShow = FALSE;
710 } 718 }
711 return QWidget::event( e ); 719 return QWidget::event( e );
712} 720}
713 721
714 722
715/*! 723/*!
716 \obsolete 724 \obsolete
717 725
718 Draws the splitter handle in the rectangle described by \a x, \a y, 726 Draws the splitter handle in the rectangle described by \a x, \a y,
719 \a w, \a h using painter \a p. 727 \a w, \a h using painter \a p.
720 \sa QStyle::drawPrimitive() 728 \sa QStyle::drawPrimitive()
721*/ 729*/
722void KDGanttMinimizeSplitter::drawSplitter( QPainter *p, 730void KDGanttMinimizeSplitter::drawSplitter( QPainter *p,
723 QCOORD x, QCOORD y, QCOORD w, QCOORD h ) 731 QCOORD x, QCOORD y, QCOORD w, QCOORD h )
724{ 732{
725#if 0 733#if 0
726 // LR 734 // LR
727 style().drawPrimitive(QStyle::PE_Splitter, p, QRect(x, y, w, h), colorGroup(), 735 style().drawPrimitive(QStyle::PE_Splitter, p, QRect(x, y, w, h), colorGroup(),
728 (orientation() == Qt::Horizontal ? 736 (orientation() == Qt::Horizontal ?
729 QStyle::Style_Horizontal : 0)); 737 QStyle::Style_Horizontal : 0));
730#endif 738#endif
731} 739}
732 740
733 741
734/*! 742/*!
735 Returns the id of the splitter to the right of or below the widget \a w, 743 Returns the id of the splitter to the right of or below the widget \a w,
736 or 0 if there is no such splitter 744 or 0 if there is no such splitter
737 (i.e. it is either not in this KDGanttMinimizeSplitter or it is at the end). 745 (i.e. it is either not in this KDGanttMinimizeSplitter or it is at the end).
738*/ 746*/
739int KDGanttMinimizeSplitter::idAfter( QWidget* w ) const 747int KDGanttMinimizeSplitter::idAfter( QWidget* w ) const
740{ 748{
741 QSplitterLayoutStruct *s = data->list.first(); 749 QSplitterLayoutStruct *s = data->list.first();
742 bool seen_w = FALSE; 750 bool seen_w = FALSE;
743 while ( s ) { 751 while ( s ) {
744 if ( s->isSplitter && seen_w ) 752 if ( s->isSplitter && seen_w )
745 return data->list.at(); 753 return data->list.at();
746 if ( !s->isSplitter && s->wid == w ) 754 if ( !s->isSplitter && s->wid == w )
747 seen_w = TRUE; 755 seen_w = TRUE;
748 s = data->list.next(); 756 s = data->list.next();
749 } 757 }
750 return 0; 758 return 0;
751} 759}
752 760
753 761
754/*! 762/*!
755 Moves the left/top edge of the splitter handle with id \a id as 763 Moves the left/top edge of the splitter handle with id \a id as
756 close as possible to position \a p, which is the distance from the 764 close as possible to position \a p, which is the distance from the
757 left (or top) edge of the widget. 765 left (or top) edge of the widget.
758 766
759 For Arabic and Hebrew the layout is reversed, and using this 767 For Arabic and Hebrew the layout is reversed, and using this
760 function to set the position of the splitter might lead to 768 function to set the position of the splitter might lead to
761 unexpected results, since in Arabic and Hebrew the position of 769 unexpected results, since in Arabic and Hebrew the position of
762 splitter one is to the left of the position of splitter zero. 770 splitter one is to the left of the position of splitter zero.
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index f453331..e6144de 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -90,128 +90,130 @@ void KDialogBase::init( const QString &caption, int buttonMask,
90 } 90 }
91 91
92 if ( buttonMask & Apply ) { 92 if ( buttonMask & Apply ) {
93 mApplyButton = new QPushButton( i18n("Apply"), this ); 93 mApplyButton = new QPushButton( i18n("Apply"), this );
94 connect( mApplyButton, SIGNAL( clicked() ), SLOT( slotApply() ) ); 94 connect( mApplyButton, SIGNAL( clicked() ), SLOT( slotApply() ) );
95 } else { 95 } else {
96 mApplyButton = 0; 96 mApplyButton = 0;
97 } 97 }
98 98
99 if ( buttonMask & Cancel ) { 99 if ( buttonMask & Cancel ) {
100 mCancelButton = new QPushButton( i18n("Cancel"), this ); 100 mCancelButton = new QPushButton( i18n("Cancel"), this );
101 connect( mCancelButton, SIGNAL( clicked() ), SLOT( slotCancel() ) ); 101 connect( mCancelButton, SIGNAL( clicked() ), SLOT( slotCancel() ) );
102 } else { 102 } else {
103 mCancelButton = 0; 103 mCancelButton = 0;
104 } 104 }
105 105
106 if ( buttonMask & Close ) { 106 if ( buttonMask & Close ) {
107 mCloseButton = new QPushButton( i18n("Close"), this ); 107 mCloseButton = new QPushButton( i18n("Close"), this );
108 connect( mCloseButton, SIGNAL( clicked() ), SLOT( slotClose() ) ); 108 connect( mCloseButton, SIGNAL( clicked() ), SLOT( slotClose() ) );
109 } else { 109 } else {
110 mCloseButton = 0; 110 mCloseButton = 0;
111 } 111 }
112} 112}
113 113
114QTabWidget *KDialogBase::tabWidget() 114QTabWidget *KDialogBase::tabWidget()
115{ 115{
116 if ( !mTabWidget ) { 116 if ( !mTabWidget ) {
117 mTabWidget = new QTabWidget( this ); 117 mTabWidget = new QTabWidget( this );
118 setMainWidget( mTabWidget ); 118 setMainWidget( mTabWidget );
119 } 119 }
120 return mTabWidget; 120 return mTabWidget;
121} 121}
122 122
123void KDialogBase::hideButtons() 123void KDialogBase::hideButtons()
124{ 124{
125 if ( mUser1Button ) mUser1Button->hide() ; 125 if ( mUser1Button ) mUser1Button->hide() ;
126 if ( mUser2Button ) mUser2Button->hide() ; 126 if ( mUser2Button ) mUser2Button->hide() ;
127 if ( mOkButton ) mOkButton->hide() ; 127 if ( mOkButton ) mOkButton->hide() ;
128 if ( mApplyButton ) mApplyButton->hide() ; 128 if ( mApplyButton ) mApplyButton->hide() ;
129 if ( mDefaultButton ) mDefaultButton->hide(); 129 if ( mDefaultButton ) mDefaultButton->hide();
130 if ( mCancelButton ) mCancelButton->hide() ; 130 if ( mCancelButton ) mCancelButton->hide() ;
131 if ( mCloseButton ) mCloseButton->hide() ; 131 if ( mCloseButton ) mCloseButton->hide() ;
132 132
133} 133}
134void KDialogBase::initLayout() 134void KDialogBase::initLayout()
135{ 135{
136 136
137 delete mTopLayout; 137 delete mTopLayout;
138 mTopLayout = new QVBoxLayout( this ); 138 mTopLayout = new QVBoxLayout( this );
139 mTopLayout->setMargin( marginHint() ); 139 mTopLayout->setMargin( marginHint() );
140 mTopLayout->setSpacing( spacingHint() ); 140 mTopLayout->setSpacing( spacingHint() );
141 141
142 mTopLayout->addWidget( mMainWidget ); 142 mTopLayout->addWidget( mMainWidget );
143 143
144 QBoxLayout *buttonLayout = new QHBoxLayout; 144 QBoxLayout *buttonLayout = new QHBoxLayout;
145 mTopLayout->addLayout( buttonLayout ); 145 mTopLayout->addLayout( buttonLayout );
146 146
147 if ( mUser1Button ) buttonLayout->addWidget( mUser1Button ); 147 if ( mUser1Button ) buttonLayout->addWidget( mUser1Button );
148 if ( mUser2Button ) buttonLayout->addWidget( mUser2Button ); 148 if ( mUser2Button ) buttonLayout->addWidget( mUser2Button );
149 if ( mOkButton ) buttonLayout->addWidget( mOkButton ); 149 if ( mOkButton ) buttonLayout->addWidget( mOkButton );
150 if ( mApplyButton ) buttonLayout->addWidget( mApplyButton ); 150 if ( mApplyButton ) buttonLayout->addWidget( mApplyButton );
151 if ( mDefaultButton ) buttonLayout->addWidget( mDefaultButton ); 151 if ( mDefaultButton ) buttonLayout->addWidget( mDefaultButton );
152 if ( mCancelButton ) buttonLayout->addWidget( mCancelButton ); 152 if ( mCancelButton ) buttonLayout->addWidget( mCancelButton );
153 if ( mCloseButton ) buttonLayout->addWidget( mCloseButton ); 153 if ( mCloseButton ) buttonLayout->addWidget( mCloseButton );
154 buttonLayout->setMargin( 0 );
155 buttonLayout->setSpacing( spacingHint() );
154} 156}
155 157
156QFrame *KDialogBase::addPage( const QString &name ) 158QFrame *KDialogBase::addPage( const QString &name )
157{ 159{
158// kdDebug() << "KDialogBase::addPage(): " << name << endl; 160// kdDebug() << "KDialogBase::addPage(): " << name << endl;
159 QFrame *frame = new QFrame( tabWidget() ); 161 QFrame *frame = new QFrame( tabWidget() );
160 tabWidget()->addTab( frame, name ); 162 tabWidget()->addTab( frame, name );
161 return frame; 163 return frame;
162} 164}
163 165
164QFrame *KDialogBase::addPage( const QString &name, int, const QPixmap & ) 166QFrame *KDialogBase::addPage( const QString &name, int, const QPixmap & )
165{ 167{
166 return addPage( name ); 168 return addPage( name );
167} 169}
168 170
169 171
170void KDialogBase::setMainWidget( QWidget *widget ) 172void KDialogBase::setMainWidget( QWidget *widget )
171{ 173{
172 kdDebug() << "KDialogBase::setMainWidget()" << endl; 174 kdDebug() << "KDialogBase::setMainWidget()" << endl;
173 175
174 mMainWidget = widget; 176 mMainWidget = widget;
175 initLayout(); 177 initLayout();
176} 178}
177 179
178void KDialogBase::setButtonText( ButtonCode id, const QString &text ) 180void KDialogBase::setButtonText( ButtonCode id, const QString &text )
179{ 181{
180 QPushButton *button = findButton( id ); 182 QPushButton *button = findButton( id );
181 if ( button ) { 183 if ( button ) {
182 button->setText( text ); 184 button->setText( text );
183 } 185 }
184} 186}
185 187
186void KDialogBase::enableButton( ButtonCode id, bool state ) 188void KDialogBase::enableButton( ButtonCode id, bool state )
187{ 189{
188 QPushButton *button = findButton( id ); 190 QPushButton *button = findButton( id );
189 if ( button ) { 191 if ( button ) {
190 button->setEnabled( state ); 192 button->setEnabled( state );
191 } 193 }
192} 194}
193 195
194QPushButton *KDialogBase::findButton( ButtonCode id ) 196QPushButton *KDialogBase::findButton( ButtonCode id )
195{ 197{
196 QPushButton *button = 0; 198 QPushButton *button = 0;
197 switch ( id ) { 199 switch ( id ) {
198 case Ok: 200 case Ok:
199 button = mOkButton; 201 button = mOkButton;
200 break; 202 break;
201 case Apply: 203 case Apply:
202 button = mApplyButton; 204 button = mApplyButton;
203 break; 205 break;
204 case User1: 206 case User1:
205 button = mUser1Button; 207 button = mUser1Button;
206 break; 208 break;
207 case User2: 209 case User2:
208 button = mUser2Button; 210 button = mUser2Button;
209 break; 211 break;
210 case Cancel: 212 case Cancel:
211 button = mCancelButton; 213 button = mCancelButton;
212 break; 214 break;
213 case Default: 215 case Default:
214 button = mDefaultButton; 216 button = mDefaultButton;
215 break; 217 break;
216 case Close: 218 case Close:
217 button = mCloseButton; 219 button = mCloseButton;