summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-01-31 09:56:31 (UTC)
committer zautrix <zautrix>2005-01-31 09:56:31 (UTC)
commit3e0b1c7cd48903b6886e081210cd83b7441b48ac (patch) (unidiff)
tree69c1937849a14b137df9c76285e061b1f4620df7 /korganizer
parent1c5f4d993bf5eeb4a21bacf61671a1a08ed1f3cd (diff)
downloadkdepimpi-3e0b1c7cd48903b6886e081210cd83b7441b48ac.zip
kdepimpi-3e0b1c7cd48903b6886e081210cd83b7441b48ac.tar.gz
kdepimpi-3e0b1c7cd48903b6886e081210cd83b7441b48ac.tar.bz2
color fixes
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaitem.cpp10
-rw-r--r--korganizer/koprefs.cpp1
-rw-r--r--korganizer/koprefs.h1
-rw-r--r--korganizer/koprefsdialog.cpp6
4 files changed, 17 insertions, 1 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index ee9f39a..a05c60e 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -1,196 +1,204 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18*/ 18*/
19 19
20#include <qlabel.h> 20#include <qlabel.h>
21#include <qlayout.h> 21#include <qlayout.h>
22#include <qhbox.h> 22#include <qhbox.h>
23#include <qvbox.h> 23#include <qvbox.h>
24#include <qtooltip.h> 24#include <qtooltip.h>
25#include <qwhatsthis.h> 25#include <qwhatsthis.h>
26#include <qdragobject.h> 26#include <qdragobject.h>
27#include <qdrawutil.h> 27#include <qdrawutil.h>
28#include <qpainter.h> 28#include <qpainter.h>
29 29
30#include <kiconloader.h> 30#include <kiconloader.h>
31#include <kdebug.h> 31#include <kdebug.h>
32#include <kglobal.h> 32#include <kglobal.h>
33#include <klocale.h> 33#include <klocale.h>
34#ifndef DESKTOP_VERSION 34#ifndef DESKTOP_VERSION
35#include <qpe/qpeapplication.h> 35#include <qpe/qpeapplication.h>
36#define AGENDA_ICON_SIZE 5 36#define AGENDA_ICON_SIZE 5
37#else 37#else
38#define AGENDA_ICON_SIZE 7 38#define AGENDA_ICON_SIZE 7
39#endif 39#endif
40#include <libkcal/icaldrag.h> 40#include <libkcal/icaldrag.h>
41#include <libkcal/vcaldrag.h> 41#include <libkcal/vcaldrag.h>
42#include <libkcal/kincidenceformatter.h> 42#include <libkcal/kincidenceformatter.h>
43extern int globalFlagBlockAgenda; 43extern int globalFlagBlockAgenda;
44extern int globalFlagBlockAgendaItemPaint; 44extern int globalFlagBlockAgendaItemPaint;
45extern int globalFlagBlockAgendaItemUpdate; 45extern int globalFlagBlockAgendaItemUpdate;
46 46
47#include "koprefs.h" 47#include "koprefs.h"
48 48
49#include "koagendaitem.h" 49#include "koagendaitem.h"
50//#include "koagendaitem.moc" 50//#include "koagendaitem.moc"
51 51
52 52
53//-------------------------------------------------------------------------- 53//--------------------------------------------------------------------------
54 54
55QToolTipGroup *KOAgendaItem::mToolTipGroup = 0; 55QToolTipGroup *KOAgendaItem::mToolTipGroup = 0;
56 56
57//-------------------------------------------------------------------------- 57//--------------------------------------------------------------------------
58 58
59KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday, 59KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday,
60 const char *name,WFlags) : 60 const char *name,WFlags) :
61 QWidget(parent, name), mIncidence(incidence), mDate(qd) 61 QWidget(parent, name), mIncidence(incidence), mDate(qd)
62{ 62{
63#ifndef DESKTOP_VERSION 63#ifndef DESKTOP_VERSION
64 QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); 64 QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
65#endif 65#endif
66 int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase 66 int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase
67 setWFlags ( wflags); 67 setWFlags ( wflags);
68 mAllDay = allday; 68 mAllDay = allday;
69 init ( incidence, qd ); 69 init ( incidence, qd );
70 setMouseTracking(true); 70 setMouseTracking(true);
71 //setAcceptDrops(true); 71 //setAcceptDrops(true);
72 xPaintCoord = -1; 72 xPaintCoord = -1;
73 yPaintCoord = -1; 73 yPaintCoord = -1;
74} 74}
75 75
76void KOAgendaItem::init ( Incidence *incidence, QDate qd ) 76void KOAgendaItem::init ( Incidence *incidence, QDate qd )
77{ 77{
78 mIncidence = incidence; 78 mIncidence = incidence;
79 mDate = qd; 79 mDate = qd;
80 mFirstMultiItem = 0; 80 mFirstMultiItem = 0;
81 mNextMultiItem = 0; 81 mNextMultiItem = 0;
82 mLastMultiItem = 0; 82 mLastMultiItem = 0;
83 computeText(); 83 computeText();
84 84
85 if ( (incidence->type() == "Todo") && 85 if ( (incidence->type() == "Todo") &&
86 ( !((static_cast<Todo*>(incidence))->isCompleted()) && 86 ( !((static_cast<Todo*>(incidence))->isCompleted()) &&
87 ((static_cast<Todo*>(incidence))->dtDue().date() <= QDate::currentDate()) ) ) { 87 ((static_cast<Todo*>(incidence))->dtDue().date() <= QDate::currentDate()) ) ) {
88 if ( (static_cast<Todo*>(incidence))->dtDue() < QDateTime::currentDateTime().date()) 88 if ( (static_cast<Todo*>(incidence))->dtDue() < QDateTime::currentDateTime().date())
89 mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ; 89 mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ;
90 else 90 else
91 mBackgroundColor = KOPrefs::instance()->mTodoDueTodayColor; 91 mBackgroundColor = KOPrefs::instance()->mTodoDueTodayColor;
92 } 92 }
93 else { 93 else {
94 QStringList categories = mIncidence->categories(); 94 QStringList categories = mIncidence->categories();
95 QString cat = categories.first(); 95 QString cat = categories.first();
96 if (cat.isEmpty()) { 96 if (cat.isEmpty()) {
97 mBackgroundColor =KOPrefs::instance()->mEventColor; 97 if ( (incidence->type() == "Todo") &&((static_cast<Todo*>(incidence))->isCompleted()) )
98 mBackgroundColor =KOPrefs::instance()->mTodoDoneColor;
99 else
100 mBackgroundColor =KOPrefs::instance()->mEventColor;
98 } else { 101 } else {
99 mBackgroundColor = *KOPrefs::instance()->categoryColor(cat); 102 mBackgroundColor = *KOPrefs::instance()->categoryColor(cat);
103 if ( (incidence->type() == "Todo") &&((static_cast<Todo*>(incidence))->isCompleted()) ) {
104 if ( mBackgroundColor == KOPrefs::instance()->mEventColor )
105 mBackgroundColor =KOPrefs::instance()->mTodoDoneColor;
106 }
100 } 107 }
108
101 } 109 }
102 mColorGroup = QColorGroup( mBackgroundColor.light(), 110 mColorGroup = QColorGroup( mBackgroundColor.light(),
103 mBackgroundColor.dark(),mBackgroundColor.light(), 111 mBackgroundColor.dark(),mBackgroundColor.light(),
104 mBackgroundColor.dark(),mBackgroundColor, black, mBackgroundColor) ; 112 mBackgroundColor.dark(),mBackgroundColor, black, mBackgroundColor) ;
105 setBackgroundColor( mBackgroundColor ); 113 setBackgroundColor( mBackgroundColor );
106 114
107 setCellXY(0,0,1); 115 setCellXY(0,0,1);
108 setCellXWidth(0); 116 setCellXWidth(0);
109 setSubCell(0); 117 setSubCell(0);
110 setSubCells(1); 118 setSubCells(1);
111 setMultiItem(0,0,0); 119 setMultiItem(0,0,0);
112 startMove(); 120 startMove();
113 mSelected = true; 121 mSelected = true;
114 select(false); 122 select(false);
115 QFontMetrics fontinf(KOPrefs::instance()->mAgendaViewFont); 123 QFontMetrics fontinf(KOPrefs::instance()->mAgendaViewFont);
116 mFontPixelSize = fontinf.height();; 124 mFontPixelSize = fontinf.height();;
117 hide(); 125 hide();
118 xPaintCoord = -1; 126 xPaintCoord = -1;
119 yPaintCoord = -1; 127 yPaintCoord = -1;
120} 128}
121 129
122 130
123KOAgendaItem::~KOAgendaItem() 131KOAgendaItem::~KOAgendaItem()
124{ 132{
125 // qDebug("deleteKOAgendaItem::~KOAgendaItem( "); 133 // qDebug("deleteKOAgendaItem::~KOAgendaItem( ");
126 134
127} 135}
128 136
129void KOAgendaItem::recreateIncidence() 137void KOAgendaItem::recreateIncidence()
130{ 138{
131#if 0 139#if 0
132 Incidence* newInc = mIncidence->clone(); 140 Incidence* newInc = mIncidence->clone();
133 newInc->recreate(); 141 newInc->recreate();
134 if ( mIncidence->doesRecur() ) { 142 if ( mIncidence->doesRecur() ) {
135 mIncidence->addExDate( mDate ); 143 mIncidence->addExDate( mDate );
136 newInc->recurrence()->unsetRecurs(); 144 newInc->recurrence()->unsetRecurs();
137 int len = mIncidence->dtStart().secsTo( ((Event*)mIncidence)->dtEnd()); 145 int len = mIncidence->dtStart().secsTo( ((Event*)mIncidence)->dtEnd());
138 QTime tim = mIncidence->dtStart().time(); 146 QTime tim = mIncidence->dtStart().time();
139 newInc->setDtStart( QDateTime(mDate, tim) ); 147 newInc->setDtStart( QDateTime(mDate, tim) );
140 ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) ); 148 ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) );
141 } 149 }
142#endif 150#endif
143 mIncidence = mIncidence->recreateCloneException( mDate ); 151 mIncidence = mIncidence->recreateCloneException( mDate );
144} 152}
145bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout) 153bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
146{ 154{
147 int size = AGENDA_ICON_SIZE; 155 int size = AGENDA_ICON_SIZE;
148 156
149 int yOff = 0; 157 int yOff = 0;
150 int xOff = 0; 158 int xOff = 0;
151 int x = pos().x() +3; 159 int x = pos().x() +3;
152 int y; 160 int y;
153 if ( mAllDay ) 161 if ( mAllDay )
154 y = pos().y()+3; 162 y = pos().y()+3;
155 else 163 else
156 y = mCellYTop * ( height() / cellHeight() ) +3; 164 y = mCellYTop * ( height() / cellHeight() ) +3;
157 if (mIncidence->cancelled()) { 165 if (mIncidence->cancelled()) {
158 int xpos = xOff*( 1 +AGENDA_ICON_SIZE )+x; 166 int xpos = xOff*( 1 +AGENDA_ICON_SIZE )+x;
159 int ypos = yOff*( 1 +AGENDA_ICON_SIZE)+y; 167 int ypos = yOff*( 1 +AGENDA_ICON_SIZE)+y;
160 p->drawLine( xpos, ypos, xpos+AGENDA_ICON_SIZE-1, ypos+AGENDA_ICON_SIZE-1 ); 168 p->drawLine( xpos, ypos, xpos+AGENDA_ICON_SIZE-1, ypos+AGENDA_ICON_SIZE-1 );
161 p->drawLine( xpos, ypos+AGENDA_ICON_SIZE-1, xpos+AGENDA_ICON_SIZE-1, ypos ); 169 p->drawLine( xpos, ypos+AGENDA_ICON_SIZE-1, xpos+AGENDA_ICON_SIZE-1, ypos );
162 if ( horLayout ) 170 if ( horLayout )
163 ++xOff; 171 ++xOff;
164 else 172 else
165 ++yOff; 173 ++yOff;
166 } 174 }
167 if (mIncidence->isAlarmEnabled()) { 175 if (mIncidence->isAlarmEnabled()) {
168 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, red ); 176 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, red );
169 if ( horLayout ) 177 if ( horLayout )
170 ++xOff; 178 ++xOff;
171 else 179 else
172 ++yOff; 180 ++yOff;
173 } 181 }
174 if (mIncidence->recurrence()->doesRecur()) { 182 if (mIncidence->recurrence()->doesRecur()) {
175 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, blue ); 183 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, blue );
176 if ( horLayout ) 184 if ( horLayout )
177 ++xOff; 185 ++xOff;
178 else 186 else
179 ++yOff; 187 ++yOff;
180 } 188 }
181 if (mIncidence->description().length() > 0) { 189 if (mIncidence->description().length() > 0) {
182 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkGreen ); 190 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkGreen );
183 if ( horLayout ) 191 if ( horLayout )
184 ++xOff; 192 ++xOff;
185 else 193 else
186 ++yOff; 194 ++yOff;
187 } 195 }
188 if (mIncidence->isReadOnly()) { 196 if (mIncidence->isReadOnly()) {
189 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, white ); 197 p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, white );
190 if ( horLayout ) 198 if ( horLayout )
191 ++xOff; 199 ++xOff;
192 else 200 else
193 ++yOff; 201 ++yOff;
194 } 202 }
195 203
196 if (mIncidence->attendeeCount()>0) { 204 if (mIncidence->attendeeCount()>0) {
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 32cc291..0548f14 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -104,192 +104,193 @@ KOPrefs::KOPrefs() :
104 addItemBool("ShowFullMenu",&mShowFullMenu,true); 104 addItemBool("ShowFullMenu",&mShowFullMenu,true);
105#endif 105#endif
106 addItemBool("ToolBarHor",&mToolBarHor, true ); 106 addItemBool("ToolBarHor",&mToolBarHor, true );
107 addItemBool("ToolBarUp",&mToolBarUp, false ); 107 addItemBool("ToolBarUp",&mToolBarUp, false );
108 addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false ); 108 addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
109 addItemInt("Whats Next Days",&mWhatsNextDays,3); 109 addItemInt("Whats Next Days",&mWhatsNextDays,3);
110 addItemInt("Whats Next Prios",&mWhatsNextPrios,1); 110 addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
111 111
112 addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true); 112 addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
113 addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true); 113 addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true);
114 addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false); 114 addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false);
115 addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true); 115 addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
116 addItemInt("AllDay Size",&mAllDaySize,28); 116 addItemInt("AllDay Size",&mAllDaySize,28);
117 QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav"; 117 QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
118 addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm ); 118 addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
119 119
120 addItemStringList("LocationDefaults",&mLocationDefaults ); 120 addItemStringList("LocationDefaults",&mLocationDefaults );
121 addItemStringList("EventSummary User",&mEventSummaryUser); 121 addItemStringList("EventSummary User",&mEventSummaryUser);
122 addItemStringList("TodoSummary User",&mTodoSummaryUser); 122 addItemStringList("TodoSummary User",&mTodoSummaryUser);
123 123
124 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); 124 addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
125 addItemBool("Enable Project View",&mEnableProjectView,false); 125 addItemBool("Enable Project View",&mEnableProjectView,false);
126 addItemBool("Auto Save",&mAutoSave,false); 126 addItemBool("Auto Save",&mAutoSave,false);
127 addItemInt("Auto Save Interval",&mAutoSaveInterval,3); 127 addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
128 addItemBool("Confirm Deletes",&mConfirm,true); 128 addItemBool("Confirm Deletes",&mConfirm,true);
129 addItemString("Archive File",&mArchiveFile); 129 addItemString("Archive File",&mArchiveFile);
130 addItemString("Html Export File",&mHtmlExportFile, 130 addItemString("Html Export File",&mHtmlExportFile,
131 QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html")); 131 QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
132 addItemBool("Html With Save",&mHtmlWithSave,false); 132 addItemBool("Html With Save",&mHtmlWithSave,false);
133 133
134 KPrefs::setCurrentGroup("Personal Settings"); 134 KPrefs::setCurrentGroup("Personal Settings");
135 135
136 addItemInt("Mail Client",&mMailClient,MailClientKMail); 136 addItemInt("Mail Client",&mMailClient,MailClientKMail);
137 addItemBool("Use Control Center Email",&mEmailControlCenter,false); 137 addItemBool("Use Control Center Email",&mEmailControlCenter,false);
138 addItemBool("Bcc",&mBcc,false); 138 addItemBool("Bcc",&mBcc,false);
139 139
140 KPrefs::setCurrentGroup("Time & Date"); 140 KPrefs::setCurrentGroup("Time & Date");
141 141
142 142
143 addItemInt("Default Start Time",&mStartTime,10); 143 addItemInt("Default Start Time",&mStartTime,10);
144 addItemInt("Default Duration",&mDefaultDuration,2); 144 addItemInt("Default Duration",&mDefaultDuration,2);
145 addItemInt("Default Alarm Time",&mAlarmTime,3); 145 addItemInt("Default Alarm Time",&mAlarmTime,3);
146 KPrefs::setCurrentGroup("AlarmSettings"); 146 KPrefs::setCurrentGroup("AlarmSettings");
147 addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20); 147 addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
148 addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7); 148 addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
149 addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5); 149 addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
150 addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3); 150 addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
151 151
152 152
153 KPrefs::setCurrentGroup("Calendar"); 153 KPrefs::setCurrentGroup("Calendar");
154 154
155 addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar); 155 addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
156 156
157 KPrefs::setCurrentGroup("Fonts"); 157 KPrefs::setCurrentGroup("Fonts");
158 // qDebug(" KPrefs::setCurrentGroup(Fonts); "); 158 // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
159 addItemFont("TimeBar Font",&mTimeBarFont); 159 addItemFont("TimeBar Font",&mTimeBarFont);
160 addItemFont("MonthView Font",&mMonthViewFont); 160 addItemFont("MonthView Font",&mMonthViewFont);
161 addItemFont("AgendaView Font",&mAgendaViewFont); 161 addItemFont("AgendaView Font",&mAgendaViewFont);
162 addItemFont("MarcusBains Font",&mMarcusBainsFont); 162 addItemFont("MarcusBains Font",&mMarcusBainsFont);
163 addItemFont("TimeLabels Font",&mTimeLabelsFont); 163 addItemFont("TimeLabels Font",&mTimeLabelsFont);
164 addItemFont("TodoView Font",&mTodoViewFont); 164 addItemFont("TodoView Font",&mTodoViewFont);
165 addItemFont("ListView Font",&mListViewFont); 165 addItemFont("ListView Font",&mListViewFont);
166 addItemFont("DateNavigator Font",&mDateNavigatorFont); 166 addItemFont("DateNavigator Font",&mDateNavigatorFont);
167 addItemFont("EditBox Font",&mEditBoxFont); 167 addItemFont("EditBox Font",&mEditBoxFont);
168 addItemFont("JournalView Font",&mJornalViewFont); 168 addItemFont("JournalView Font",&mJornalViewFont);
169 addItemFont("WhatsNextView Font",&mWhatsNextFont); 169 addItemFont("WhatsNextView Font",&mWhatsNextFont);
170 addItemFont("EventView Font",&mEventViewFont); 170 addItemFont("EventView Font",&mEventViewFont);
171 171
172 KPrefs::setCurrentGroup("RemoteSyncing"); 172 KPrefs::setCurrentGroup("RemoteSyncing");
173 addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" ); 173 addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );
174 addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 174 addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" );
175 addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 175 addItemBool("ShowSyncEvents",&mShowSyncEvents,false);
176 addItemInt("LastSyncTime",&mLastSyncTime,0); 176 addItemInt("LastSyncTime",&mLastSyncTime,0);
177 177
178#ifdef _WIN32_ 178#ifdef _WIN32_
179 QString hdp= locateLocal("data","korganizer")+"\\\\"; 179 QString hdp= locateLocal("data","korganizer")+"\\\\";
180#else 180#else
181 QString hdp= locateLocal("data","korganizer")+"/"; 181 QString hdp= locateLocal("data","korganizer")+"/";
182#endif 182#endif
183 183
184 KPrefs::setCurrentGroup("LoadSaveFileNames"); 184 KPrefs::setCurrentGroup("LoadSaveFileNames");
185 185
186 addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" ); 186 addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
187 addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" ); 187 addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
188 addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" ); 188 addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
189 addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" ); 189 addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
190 190
191 191
192 KPrefs::setCurrentGroup("Locale"); 192 KPrefs::setCurrentGroup("Locale");
193 addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 193 addItemBool("ShortDateInViewer",&mShortDateInViewer,false);
194 194
195 195
196 KPrefs::setCurrentGroup("Colors"); 196 KPrefs::setCurrentGroup("Colors");
197 addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor); 197 addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
198 addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor); 198 addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
199 addItemColor("Event Color",&mEventColor,mDefaultCategoryColor); 199 addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
200 addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) );
200 addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor); 201 addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
201 addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor); 202 addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
202 addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor); 203 addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
203 addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor); 204 addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
204 addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 )); 205 addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
205 addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 )); 206 addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
206 addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 )); 207 addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
207 addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 208 addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true);
208 addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true); 209 addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
209 addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 210 addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false);
210 addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 )); 211 addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
211 addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 )); 212 addItemColor("AppColor2",&mAppColor2,QColor( 174,216,255 ));
212 addItemBool("UseAppColors",&mUseAppColors,false); 213 addItemBool("UseAppColors",&mUseAppColors,false);
213 214
214 215
215 216
216 KPrefs::setCurrentGroup("Views"); 217 KPrefs::setCurrentGroup("Views");
217 addItemBool("Show Date Navigator",&mShowDateNavigator,true); 218 addItemBool("Show Date Navigator",&mShowDateNavigator,true);
218 addItemInt("Hour Size",&mHourSize,8); 219 addItemInt("Hour Size",&mHourSize,8);
219 addItemBool("Show Daily Recurrences",&mDailyRecur,true); 220 addItemBool("Show Daily Recurrences",&mDailyRecur,true);
220 addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true); 221 addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
221 addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true); 222 addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
222 addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true); 223 addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
223 addItemBool("ShowShortMonthName",&mMonthShowShort,false); 224 addItemBool("ShowShortMonthName",&mMonthShowShort,false);
224 addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true); 225 addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
225#ifdef DESKTOP_VERION 226#ifdef DESKTOP_VERION
226 addItemBool("Enable ToolTips",&mEnableToolTips,true); 227 addItemBool("Enable ToolTips",&mEnableToolTips,true);
227#else 228#else
228 addItemBool("Enable ToolTips",&mEnableToolTips,false); 229 addItemBool("Enable ToolTips",&mEnableToolTips,false);
229#endif 230#endif
230 addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false); 231 addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
231 addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false); 232 addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
232 addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true); 233 addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
233 addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true); 234 addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
234 addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true); 235 addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true);
235 addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false); 236 addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
236 addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false); 237 addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
237 addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true); 238 addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
238 addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true); 239 addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
239 addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);; 240 addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
240 addItemBool("WNViewShowsPast",&mWNViewShowsPast,true); 241 addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
241 addItemBool("WNViewShowLocation",&mWNViewShowLocation,false); 242 addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
242 addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false); 243 addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
243 addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true); 244 addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
244 addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false); 245 addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
245 addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false); 246 addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
246 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false); 247 addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false);
247 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false); 248 addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
248 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false); 249 addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
249#ifdef DESKTOP_VERSION 250#ifdef DESKTOP_VERSION
250 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true); 251 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
251#else 252#else
252 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false); 253 addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
253#endif 254#endif
254 addItemInt("Day Begins",&mDayBegins,7); 255 addItemInt("Day Begins",&mDayBegins,7);
255 addItemInt("Working Hours Start",&mWorkingHoursStart,8); 256 addItemInt("Working Hours Start",&mWorkingHoursStart,8);
256 addItemInt("Working Hours End",&mWorkingHoursEnd,17); 257 addItemInt("Working Hours End",&mWorkingHoursEnd,17);
257 addItemBool("Exclude Holidays",&mExcludeHolidays,true); 258 addItemBool("Exclude Holidays",&mExcludeHolidays,true);
258 addItemBool("Exclude Saturdays",&mExcludeSaturdays,true); 259 addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
259 260
260 addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false); 261 addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
261 addItemBool("Full View Month",&mFullViewMonth,true); 262 addItemBool("Full View Month",&mFullViewMonth,true);
262 addItemBool("Full View Todo",&mFullViewTodo,true); 263 addItemBool("Full View Todo",&mFullViewTodo,true);
263 addItemBool("Quick Todo",&mEnableQuickTodo,false); 264 addItemBool("Quick Todo",&mEnableQuickTodo,false);
264 265
265 addItemInt("Next X Days",&mNextXDays,3); 266 addItemInt("Next X Days",&mNextXDays,3);
266 267
267 KPrefs::setCurrentGroup("Printer"); 268 KPrefs::setCurrentGroup("Printer");
268 269
269 KPrefs::setCurrentGroup("Layout"); 270 KPrefs::setCurrentGroup("Layout");
270 271
271 addItemBool("CompactDialogs",&mCompactDialogs,false); 272 addItemBool("CompactDialogs",&mCompactDialogs,false);
272 addItemBool("VerticalScreen",&mVerticalScreen,true); 273 addItemBool("VerticalScreen",&mVerticalScreen,true);
273 274
274 KPrefs::setCurrentGroup("KOrganizer Plugins"); 275 KPrefs::setCurrentGroup("KOrganizer Plugins");
275 276
276 addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays"); 277 addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
277 278
278 KPrefs::setCurrentGroup("Group Scheduling"); 279 KPrefs::setCurrentGroup("Group Scheduling");
279 280
280 addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail); 281 addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
281 addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend); 282 addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
282 addItemStringList("AdditionalMails",&mAdditionalMails,""); 283 addItemStringList("AdditionalMails",&mAdditionalMails,"");
283 addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto); 284 addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
284 addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto); 285 addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
285 addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto); 286 addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
286 addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto); 287 addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
287 addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto); 288 addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
288 289
289 KPrefs::setCurrentGroup( "Editors" ); 290 KPrefs::setCurrentGroup( "Editors" );
290 291
291 addItemStringList( "EventTemplates", &mEventTemplates ); 292 addItemStringList( "EventTemplates", &mEventTemplates );
292 addItemStringList( "TodoTemplates", &mTodoTemplates ); 293 addItemStringList( "TodoTemplates", &mTodoTemplates );
293 294
294 addItemInt("DestinationPolicy",&mDestination,standardDestination); 295 addItemInt("DestinationPolicy",&mDestination,standardDestination);
295 296
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index b3acda7..8b849fa 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -30,192 +30,193 @@
30class KConfig; 30class KConfig;
31class QFont; 31class QFont;
32class QColor; 32class QColor;
33class QStringList; 33class QStringList;
34 34
35class KOPrefs : public KPimPrefs 35class KOPrefs : public KPimPrefs
36{ 36{
37 public: 37 public:
38 enum { FormatVCalendar, FormatICalendar }; 38 enum { FormatVCalendar, FormatICalendar };
39 enum { MailClientKMail, MailClientSendmail }; 39 enum { MailClientKMail, MailClientSendmail };
40 enum { IMIPDummy, IMIPKMail }; 40 enum { IMIPDummy, IMIPKMail };
41 enum { IMIPOutbox, IMIPdirectsend }; 41 enum { IMIPOutbox, IMIPdirectsend };
42 enum { neverAuto, addressbookAuto, selectedAuto }; 42 enum { neverAuto, addressbookAuto, selectedAuto };
43 enum { standardDestination, askDestination }; 43 enum { standardDestination, askDestination };
44 44
45 virtual ~KOPrefs(); 45 virtual ~KOPrefs();
46 46
47 /** Get instance of KOPrefs. It is made sure that there is only one 47 /** Get instance of KOPrefs. It is made sure that there is only one
48 instance. */ 48 instance. */
49 static KOPrefs *instance(); 49 static KOPrefs *instance();
50 50
51 /** Set preferences to default values */ 51 /** Set preferences to default values */
52 void usrSetDefaults(); 52 void usrSetDefaults();
53 53
54 /** Read preferences from config file */ 54 /** Read preferences from config file */
55 void usrReadConfig(); 55 void usrReadConfig();
56 56
57 /** Write preferences to config file */ 57 /** Write preferences to config file */
58 void usrWriteConfig(); 58 void usrWriteConfig();
59 void setCategoryDefaults(); 59 void setCategoryDefaults();
60 60
61 protected: 61 protected:
62 void setTimeZoneIdDefault(); 62 void setTimeZoneIdDefault();
63 63
64 /** Fill empty mail fields with default values. */ 64 /** Fill empty mail fields with default values. */
65 void fillMailDefaults(); 65 void fillMailDefaults();
66 66
67 private: 67 private:
68 /** Constructor disabled for public. Use instance() to create a KOPrefs 68 /** Constructor disabled for public. Use instance() to create a KOPrefs
69 object. */ 69 object. */
70 KOPrefs(); 70 KOPrefs();
71 71
72 static KOPrefs *mInstance; 72 static KOPrefs *mInstance;
73 QStringList getDefaultList(); 73 QStringList getDefaultList();
74 public: 74 public:
75 // preferences data 75 // preferences data
76 KConfig* getConfig(); 76 KConfig* getConfig();
77 void setFullName(const QString &); 77 void setFullName(const QString &);
78 QString fullName(); 78 QString fullName();
79 void setEmail(const QString &); 79 void setEmail(const QString &);
80 QString email(); 80 QString email();
81 81
82 QString mAdditional; 82 QString mAdditional;
83 83
84 bool mEmailControlCenter; 84 bool mEmailControlCenter;
85 85
86 bool mBcc; 86 bool mBcc;
87 bool mAutoSave; 87 bool mAutoSave;
88 int mAutoSaveInterval; 88 int mAutoSaveInterval;
89 bool mConfirm; 89 bool mConfirm;
90 90
91 bool mEnableGroupScheduling; 91 bool mEnableGroupScheduling;
92 bool mEnableProjectView; 92 bool mEnableProjectView;
93 93
94 int mDefaultFormat; 94 int mDefaultFormat;
95 int mMailClient; 95 int mMailClient;
96 96
97 int mStartTime; 97 int mStartTime;
98 int mDefaultDuration; 98 int mDefaultDuration;
99 int mAlarmTime; 99 int mAlarmTime;
100 100
101 int mWorkingHoursStart; 101 int mWorkingHoursStart;
102 int mWorkingHoursEnd; 102 int mWorkingHoursEnd;
103 bool mExcludeHolidays; 103 bool mExcludeHolidays;
104 bool mExcludeSaturdays; 104 bool mExcludeSaturdays;
105 bool mMarcusBainsShowSeconds; 105 bool mMarcusBainsShowSeconds;
106 106
107 QFont mTimeBarFont; 107 QFont mTimeBarFont;
108 QFont mMonthViewFont; 108 QFont mMonthViewFont;
109 QFont mAgendaViewFont; 109 QFont mAgendaViewFont;
110 QFont mMarcusBainsFont; 110 QFont mMarcusBainsFont;
111 QFont mTimeLabelsFont; 111 QFont mTimeLabelsFont;
112 QFont mTodoViewFont; 112 QFont mTodoViewFont;
113 QFont mListViewFont; 113 QFont mListViewFont;
114 QFont mDateNavigatorFont; 114 QFont mDateNavigatorFont;
115 QFont mEditBoxFont; 115 QFont mEditBoxFont;
116 QFont mJornalViewFont; 116 QFont mJornalViewFont;
117 QFont mWhatsNextFont; 117 QFont mWhatsNextFont;
118 QFont mEventViewFont; 118 QFont mEventViewFont;
119 119
120 120
121 121
122 122
123 QColor mHolidayColor; 123 QColor mHolidayColor;
124 QColor mHighlightColor; 124 QColor mHighlightColor;
125 QColor mEventColor; 125 QColor mEventColor;
126 QColor mTodoDoneColor;
126 QColor mAgendaBgColor; 127 QColor mAgendaBgColor;
127 QColor mWorkingHoursColor; 128 QColor mWorkingHoursColor;
128 QColor mTodoDueTodayColor; 129 QColor mTodoDueTodayColor;
129 QColor mTodoOverdueColor; 130 QColor mTodoOverdueColor;
130 QColor mMonthViewEvenColor; 131 QColor mMonthViewEvenColor;
131 QColor mMonthViewOddColor; 132 QColor mMonthViewOddColor;
132 QColor mMonthViewHolidayColor; 133 QColor mMonthViewHolidayColor;
133 bool mMonthViewUsesDayColors; 134 bool mMonthViewUsesDayColors;
134 bool mMonthViewSatSunTog; 135 bool mMonthViewSatSunTog;
135 QColor mAppColor1; 136 QColor mAppColor1;
136 QColor mAppColor2; 137 QColor mAppColor2;
137 bool mUseAppColors; 138 bool mUseAppColors;
138 139
139 int mDayBegins; 140 int mDayBegins;
140 int mHourSize; 141 int mHourSize;
141 int mAllDaySize; 142 int mAllDaySize;
142 bool mShowFullMenu; 143 bool mShowFullMenu;
143 bool mDailyRecur; 144 bool mDailyRecur;
144 bool mWeeklyRecur; 145 bool mWeeklyRecur;
145 bool mMonthDailyRecur; 146 bool mMonthDailyRecur;
146 bool mMonthWeeklyRecur; 147 bool mMonthWeeklyRecur;
147 bool mMonthShowIcons; 148 bool mMonthShowIcons;
148 bool mMonthShowShort; 149 bool mMonthShowShort;
149 bool mEnableToolTips; 150 bool mEnableToolTips;
150 bool mEnableMonthScroll; 151 bool mEnableMonthScroll;
151 bool mFullViewMonth; 152 bool mFullViewMonth;
152 bool mMonthViewUsesCategoryColor; 153 bool mMonthViewUsesCategoryColor;
153 bool mFullViewTodo; 154 bool mFullViewTodo;
154 bool mShowCompletedTodo; 155 bool mShowCompletedTodo;
155 bool mMarcusBainsEnabled; 156 bool mMarcusBainsEnabled;
156 int mNextXDays; 157 int mNextXDays;
157 int mWhatsNextDays; 158 int mWhatsNextDays;
158 int mWhatsNextPrios; 159 int mWhatsNextPrios;
159 bool mEnableQuickTodo; 160 bool mEnableQuickTodo;
160 161
161 bool mCompactDialogs; 162 bool mCompactDialogs;
162 bool mVerticalScreen; 163 bool mVerticalScreen;
163 164
164 bool mShowIconNewTodo; 165 bool mShowIconNewTodo;
165 bool mShowIconNewEvent; 166 bool mShowIconNewEvent;
166 bool mShowIconSearch; 167 bool mShowIconSearch;
167 bool mShowIconList; 168 bool mShowIconList;
168 bool mShowIconDay1; 169 bool mShowIconDay1;
169 bool mShowIconDay5; 170 bool mShowIconDay5;
170 bool mShowIconDay7; 171 bool mShowIconDay7;
171 bool mShowIconMonth; 172 bool mShowIconMonth;
172 bool mShowIconTodoview; 173 bool mShowIconTodoview;
173 bool mShowIconBackFast; 174 bool mShowIconBackFast;
174 bool mShowIconBack; 175 bool mShowIconBack;
175 bool mShowIconToday; 176 bool mShowIconToday;
176 bool mShowIconForward; 177 bool mShowIconForward;
177 bool mShowIconForwardFast; 178 bool mShowIconForwardFast;
178 bool mShowIconWhatsThis; 179 bool mShowIconWhatsThis;
179 bool mShowIconNextDays; 180 bool mShowIconNextDays;
180 bool mShowIconNext; 181 bool mShowIconNext;
181 bool mShowIconJournal; 182 bool mShowIconJournal;
182 183
183 bool mShowIconStretch; 184 bool mShowIconStretch;
184 185
185 bool mToolBarHor; 186 bool mToolBarHor;
186 bool mToolBarUp; 187 bool mToolBarUp;
187 bool mToolBarMiniIcons; 188 bool mToolBarMiniIcons;
188 189
189 bool mAskForQuit; 190 bool mAskForQuit;
190 bool mUsePassWd; 191 bool mUsePassWd;
191 bool mShowSyncEvents; 192 bool mShowSyncEvents;
192 bool mShowTodoInAgenda; 193 bool mShowTodoInAgenda;
193 bool mShowTimeInAgenda; 194 bool mShowTimeInAgenda;
194 bool mHideNonStartedTodos; 195 bool mHideNonStartedTodos;
195 196
196 int mLastSyncTime; 197 int mLastSyncTime;
197 void setCategoryColor(QString cat,const QColor & color); 198 void setCategoryColor(QString cat,const QColor & color);
198 QColor *categoryColor(QString cat); 199 QColor *categoryColor(QString cat);
199 200
200 QString mArchiveFile; 201 QString mArchiveFile;
201 QString mHtmlExportFile; 202 QString mHtmlExportFile;
202 bool mHtmlWithSave; 203 bool mHtmlWithSave;
203 204
204 QStringList mSelectedPlugins; 205 QStringList mSelectedPlugins;
205 206
206 QString mLastImportFile; 207 QString mLastImportFile;
207 QString mLastVcalFile; 208 QString mLastVcalFile;
208 QString mLastSaveFile; 209 QString mLastSaveFile;
209 QString mLastLoadFile; 210 QString mLastLoadFile;
210 211
211 212
212 QString mDefaultAlarmFile; 213 QString mDefaultAlarmFile;
213 int mIMIPScheduler; 214 int mIMIPScheduler;
214 int mIMIPSend; 215 int mIMIPSend;
215 QStringList mAdditionalMails; 216 QStringList mAdditionalMails;
216 int mIMIPAutoRefresh; 217 int mIMIPAutoRefresh;
217 int mIMIPAutoInsertReply; 218 int mIMIPAutoInsertReply;
218 int mIMIPAutoInsertRequest; 219 int mIMIPAutoInsertRequest;
219 int mIMIPAutoFreeBusy; 220 int mIMIPAutoFreeBusy;
220 int mIMIPAutoFreeBusyReply; 221 int mIMIPAutoFreeBusyReply;
221 222
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 1b24f56..580dff2 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -1083,192 +1083,198 @@ void KOPrefsDialog::setupFontsTab()
1083 1083
1084 KPrefsDialogWidFont *monthViewFont = 1084 KPrefsDialogWidFont *monthViewFont =
1085 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"), 1085 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"),
1086 i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame); 1086 i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame);
1087 topLayout->addWidget(monthViewFont->label(),i,0); 1087 topLayout->addWidget(monthViewFont->label(),i,0);
1088 topLayout->addWidget(monthViewFont->preview(),i,1); 1088 topLayout->addWidget(monthViewFont->preview(),i,1);
1089 topLayout->addWidget(monthViewFont->button(),i,2); 1089 topLayout->addWidget(monthViewFont->button(),i,2);
1090 ++i; 1090 ++i;
1091 1091
1092 1092
1093 KPrefsDialogWidFont *lVFont = 1093 KPrefsDialogWidFont *lVFont =
1094 addWidFont(i18n("Event"),i18n("List View:"), 1094 addWidFont(i18n("Event"),i18n("List View:"),
1095 &(KOPrefs::instance()->mListViewFont),topFrame); 1095 &(KOPrefs::instance()->mListViewFont),topFrame);
1096 topLayout->addWidget(lVFont->label(),i,0); 1096 topLayout->addWidget(lVFont->label(),i,0);
1097 topLayout->addWidget(lVFont->preview(),i,1); 1097 topLayout->addWidget(lVFont->preview(),i,1);
1098 topLayout->addWidget(lVFont->button(),i,2); 1098 topLayout->addWidget(lVFont->button(),i,2);
1099 ++i; 1099 ++i;
1100 1100
1101 1101
1102 tVFont = 1102 tVFont =
1103 addWidFont(i18n("ToDo"),i18n("ToDoView:"), 1103 addWidFont(i18n("ToDo"),i18n("ToDoView:"),
1104 &(KOPrefs::instance()->mTodoViewFont),topFrame); 1104 &(KOPrefs::instance()->mTodoViewFont),topFrame);
1105 topLayout->addWidget(tVFont->label(),i,0); 1105 topLayout->addWidget(tVFont->label(),i,0);
1106 topLayout->addWidget(tVFont->preview(),i,1); 1106 topLayout->addWidget(tVFont->preview(),i,1);
1107 topLayout->addWidget(tVFont->button(),i,2); 1107 topLayout->addWidget(tVFont->button(),i,2);
1108 ++i; 1108 ++i;
1109 1109
1110 1110
1111 tVFont = 1111 tVFont =
1112 addWidFont(i18n("Today"),i18n("JournalView:"), 1112 addWidFont(i18n("Today"),i18n("JournalView:"),
1113 &(KOPrefs::instance()->mJornalViewFont),topFrame); 1113 &(KOPrefs::instance()->mJornalViewFont),topFrame);
1114 topLayout->addWidget(tVFont->label(),i,0); 1114 topLayout->addWidget(tVFont->label(),i,0);
1115 topLayout->addWidget(tVFont->preview(),i,1); 1115 topLayout->addWidget(tVFont->preview(),i,1);
1116 topLayout->addWidget(tVFont->button(),i,2); 1116 topLayout->addWidget(tVFont->button(),i,2);
1117 ++i; 1117 ++i;
1118 1118
1119 1119
1120 1120
1121 1121
1122 topLayout->setColStretch(1,1); 1122 topLayout->setColStretch(1,1);
1123 topLayout->setRowStretch(4,1); 1123 topLayout->setRowStretch(4,1);
1124 1124
1125 1125
1126 1126
1127 1127
1128} 1128}
1129 1129
1130void KOPrefsDialog::setupColorsTab() 1130void KOPrefsDialog::setupColorsTab()
1131{ 1131{
1132 QFrame *topFrame = addPage(i18n("Colors"),0,0); 1132 QFrame *topFrame = addPage(i18n("Colors"),0,0);
1133 // DesktopIcon("colorize",KIcon::SizeMedium)); 1133 // DesktopIcon("colorize",KIcon::SizeMedium));
1134 1134
1135 QGridLayout *topLayout = new QGridLayout(topFrame,5,2); 1135 QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
1136 // topLayout->setSpacing(spacingHint()); 1136 // topLayout->setSpacing(spacingHint());
1137 // topLayout->setMargin(marginHint()); 1137 // topLayout->setMargin(marginHint());
1138 1138
1139 topLayout->setSpacing(2); 1139 topLayout->setSpacing(2);
1140 topLayout->setMargin(3); 1140 topLayout->setMargin(3);
1141 1141
1142 int ii = 1; 1142 int ii = 1;
1143 QGroupBox *categoryGroup ; 1143 QGroupBox *categoryGroup ;
1144 1144
1145 categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"), 1145 categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"),
1146 topFrame); 1146 topFrame);
1147 topLayout->addMultiCellWidget(categoryGroup,0,0,0,1); 1147 topLayout->addMultiCellWidget(categoryGroup,0,0,0,1);
1148 1148
1149 mCategoryCombo = new QComboBox(categoryGroup); 1149 mCategoryCombo = new QComboBox(categoryGroup);
1150 mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); 1150 mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
1151 connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor())); 1151 connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor()));
1152 1152
1153 mCategoryButton = new KColorButton(categoryGroup); 1153 mCategoryButton = new KColorButton(categoryGroup);
1154 connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor())); 1154 connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor()));
1155 updateCategoryColor(); 1155 updateCategoryColor();
1156 1156
1157 1157
1158 // Holiday Color 1158 // Holiday Color
1159 1159
1160 KPrefsDialogWidColor *holidayColor = 1160 KPrefsDialogWidColor *holidayColor =
1161 addWidColor(i18n("Holiday color:"), 1161 addWidColor(i18n("Holiday color:"),
1162 &(KOPrefs::instance()->mHolidayColor),topFrame); 1162 &(KOPrefs::instance()->mHolidayColor),topFrame);
1163 topLayout->addWidget(holidayColor->label(),ii,0); 1163 topLayout->addWidget(holidayColor->label(),ii,0);
1164 topLayout->addWidget(holidayColor->button(),ii++,1); 1164 topLayout->addWidget(holidayColor->button(),ii++,1);
1165 1165
1166 // Highlight Color 1166 // Highlight Color
1167 KPrefsDialogWidColor *highlightColor = 1167 KPrefsDialogWidColor *highlightColor =
1168 addWidColor(i18n("Highlight color:"), 1168 addWidColor(i18n("Highlight color:"),
1169 &(KOPrefs::instance()->mHighlightColor),topFrame); 1169 &(KOPrefs::instance()->mHighlightColor),topFrame);
1170 topLayout->addWidget(highlightColor->label(),ii,0); 1170 topLayout->addWidget(highlightColor->label(),ii,0);
1171 topLayout->addWidget(highlightColor->button(),ii++,1); 1171 topLayout->addWidget(highlightColor->button(),ii++,1);
1172 1172
1173 // Event color 1173 // Event color
1174 KPrefsDialogWidColor *eventColor = 1174 KPrefsDialogWidColor *eventColor =
1175 addWidColor(i18n("Default event color:"), 1175 addWidColor(i18n("Default event color:"),
1176 &(KOPrefs::instance()->mEventColor),topFrame); 1176 &(KOPrefs::instance()->mEventColor),topFrame);
1177 topLayout->addWidget(eventColor->label(),ii,0); 1177 topLayout->addWidget(eventColor->label(),ii,0);
1178 topLayout->addWidget(eventColor->button(),ii++,1); 1178 topLayout->addWidget(eventColor->button(),ii++,1);
1179 eventColor =
1180 addWidColor(i18n("Default todo done color:"),
1181 &(KOPrefs::instance()->mTodoDoneColor),topFrame);
1182 topLayout->addWidget(eventColor->label(),ii,0);
1183 topLayout->addWidget(eventColor->button(),ii++,1);
1184
1179 1185
1180 // agenda view background color 1186 // agenda view background color
1181 KPrefsDialogWidColor *agendaBgColor = 1187 KPrefsDialogWidColor *agendaBgColor =
1182 addWidColor(i18n("Agenda view background color:"), 1188 addWidColor(i18n("Agenda view background color:"),
1183 &(KOPrefs::instance()->mAgendaBgColor),topFrame); 1189 &(KOPrefs::instance()->mAgendaBgColor),topFrame);
1184 topLayout->addWidget(agendaBgColor->label(),ii,0); 1190 topLayout->addWidget(agendaBgColor->label(),ii,0);
1185 topLayout->addWidget(agendaBgColor->button(),ii++,1); 1191 topLayout->addWidget(agendaBgColor->button(),ii++,1);
1186 1192
1187 // working hours color 1193 // working hours color
1188 KPrefsDialogWidColor *workingHoursColor = 1194 KPrefsDialogWidColor *workingHoursColor =
1189 addWidColor(i18n("Working hours color:"), 1195 addWidColor(i18n("Working hours color:"),
1190 &(KOPrefs::instance()->mWorkingHoursColor),topFrame); 1196 &(KOPrefs::instance()->mWorkingHoursColor),topFrame);
1191 topLayout->addWidget(workingHoursColor->label(),ii,0); 1197 topLayout->addWidget(workingHoursColor->label(),ii,0);
1192 topLayout->addWidget(workingHoursColor->button(),ii++,1); 1198 topLayout->addWidget(workingHoursColor->button(),ii++,1);
1193 1199
1194 KPrefsDialogWidBool *sb = 1200 KPrefsDialogWidBool *sb =
1195 addWidBool(i18n("Use colors for application:"), 1201 addWidBool(i18n("Use colors for application:"),
1196 &(KOPrefs::instance()->mUseAppColors),topFrame); 1202 &(KOPrefs::instance()->mUseAppColors),topFrame);
1197 topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 ); 1203 topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 );
1198 1204
1199 ii++; 1205 ii++;
1200 KPrefsDialogWidColor * workingHoursColor1 = 1206 KPrefsDialogWidColor * workingHoursColor1 =
1201 addWidColor(i18n("Buttons, menus, etc.:"), 1207 addWidColor(i18n("Buttons, menus, etc.:"),
1202 &(KOPrefs::instance()->mAppColor1),topFrame); 1208 &(KOPrefs::instance()->mAppColor1),topFrame);
1203 topLayout->addWidget(workingHoursColor1->label(),ii,0); 1209 topLayout->addWidget(workingHoursColor1->label(),ii,0);
1204 topLayout->addWidget(workingHoursColor1->button(),ii++,1); 1210 topLayout->addWidget(workingHoursColor1->button(),ii++,1);
1205 1211
1206 KPrefsDialogWidColor * workingHoursColor2 = 1212 KPrefsDialogWidColor * workingHoursColor2 =
1207 addWidColor(i18n("Frames, labels, etc.:"), 1213 addWidColor(i18n("Frames, labels, etc.:"),
1208 &(KOPrefs::instance()->mAppColor2),topFrame); 1214 &(KOPrefs::instance()->mAppColor2),topFrame);
1209 topLayout->addWidget(workingHoursColor2->label(),ii,0); 1215 topLayout->addWidget(workingHoursColor2->label(),ii,0);
1210 topLayout->addWidget(workingHoursColor2->button(),ii++,1); 1216 topLayout->addWidget(workingHoursColor2->button(),ii++,1);
1211 1217
1212 1218
1213 1219
1214} 1220}
1215 1221
1216void KOPrefsDialog::setCategoryColor() 1222void KOPrefsDialog::setCategoryColor()
1217{ 1223{
1218 mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color())); 1224 mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color()));
1219} 1225}
1220 1226
1221void KOPrefsDialog::updateCategoryColor() 1227void KOPrefsDialog::updateCategoryColor()
1222{ 1228{
1223 QString cat = mCategoryCombo->currentText(); 1229 QString cat = mCategoryCombo->currentText();
1224 QColor *color = mCategoryDict.find(cat); 1230 QColor *color = mCategoryDict.find(cat);
1225 if (!color) { 1231 if (!color) {
1226 color = KOPrefs::instance()->categoryColor(cat); 1232 color = KOPrefs::instance()->categoryColor(cat);
1227 } 1233 }
1228 if (color) { 1234 if (color) {
1229 mCategoryButton->setColor(*color); 1235 mCategoryButton->setColor(*color);
1230 } 1236 }
1231} 1237}
1232 1238
1233void KOPrefsDialog::setupPrinterTab() 1239void KOPrefsDialog::setupPrinterTab()
1234{ 1240{
1235 mPrinterTab = addPage(i18n("Printing"),0, 1241 mPrinterTab = addPage(i18n("Printing"),0,
1236 DesktopIcon("fileprint",KIcon::SizeMedium)); 1242 DesktopIcon("fileprint",KIcon::SizeMedium));
1237 1243
1238 QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2); 1244 QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
1239 topLayout->setSpacing(spacingHint()); 1245 topLayout->setSpacing(spacingHint());
1240 topLayout->setMargin(marginHint()); 1246 topLayout->setMargin(marginHint());
1241 1247
1242 topLayout->setRowStretch(4,1); 1248 topLayout->setRowStretch(4,1);
1243} 1249}
1244 1250
1245void KOPrefsDialog::setupGroupSchedulingTab() 1251void KOPrefsDialog::setupGroupSchedulingTab()
1246{ 1252{
1247#if 0 1253#if 0
1248 QFrame *topFrame = addPage(i18n("Group Scheduling"),0, 1254 QFrame *topFrame = addPage(i18n("Group Scheduling"),0,
1249 DesktopIcon("personal",KIcon::SizeMedium)); 1255 DesktopIcon("personal",KIcon::SizeMedium));
1250 1256
1251 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 1257 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
1252 topLayout->setSpacing(spacingHint()); 1258 topLayout->setSpacing(spacingHint());
1253 topLayout->setMargin(marginHint()); 1259 topLayout->setMargin(marginHint());
1254 1260
1255#if 0 1261#if 0
1256 KPrefsDialogWidRadios *schedulerGroup = 1262 KPrefsDialogWidRadios *schedulerGroup =
1257 addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler), 1263 addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler),
1258 topFrame); 1264 topFrame);
1259 schedulerGroup->addRadio("Dummy"); // Only for debugging 1265 schedulerGroup->addRadio("Dummy"); // Only for debugging
1260 schedulerGroup->addRadio(i18n("Mail client")); 1266 schedulerGroup->addRadio(i18n("Mail client"));
1261 1267
1262 topLayout->addMultiCellWidget(schedulerGroup->groupBox(),0,0,0,1); 1268 topLayout->addMultiCellWidget(schedulerGroup->groupBox(),0,0,0,1);
1263#endif 1269#endif
1264 1270
1265 KPrefsDialogWidRadios *sendGroup = 1271 KPrefsDialogWidRadios *sendGroup =
1266 addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend), 1272 addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend),
1267 topFrame); 1273 topFrame);
1268 sendGroup->addRadio(i18n("Send to outbox")); 1274 sendGroup->addRadio(i18n("Send to outbox"));
1269 sendGroup->addRadio(i18n("Send directly")); 1275 sendGroup->addRadio(i18n("Send directly"));
1270 1276
1271 topLayout->addMultiCellWidget(sendGroup->groupBox(),1,1,0,1); 1277 topLayout->addMultiCellWidget(sendGroup->groupBox(),1,1,0,1);
1272 1278
1273 topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1); 1279 topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1);
1274 mAMails = new QListView(topFrame); 1280 mAMails = new QListView(topFrame);