author | zautrix <zautrix> | 2005-04-20 10:43:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-20 10:43:07 (UTC) |
commit | f23afbb9c09b4ee0f00af8f04ee4458181792cd0 (patch) (unidiff) | |
tree | 807bcaf329d257ec2a0c5c6e3a6afc7ab53a6078 /korganizer | |
parent | 03f7f26ad34f50dd86f335c7c5a25a292d642793 (diff) | |
download | kdepimpi-f23afbb9c09b4ee0f00af8f04ee4458181792cd0.zip kdepimpi-f23afbb9c09b4ee0f00af8f04ee4458181792cd0.tar.gz kdepimpi-f23afbb9c09b4ee0f00af8f04ee4458181792cd0.tar.bz2 |
fixes
-rw-r--r-- | korganizer/kodaymatrix.cpp | 14 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index df606d0..c32a2a4 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -1,502 +1,506 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2001 Eitzenberger Thomas <thomas.eitzenberger@siemens.at> | 3 | Copyright (c) 2001 Eitzenberger Thomas <thomas.eitzenberger@siemens.at> |
4 | Parts of the source code have been copied from kdpdatebutton.cpp | 4 | Parts of the source code have been copied from kdpdatebutton.cpp |
5 | 5 | ||
6 | This program is free software; you can redistribute it and/or modify | 6 | This program is free software; you can redistribute it and/or modify |
7 | it under the terms of the GNU General Public License as published by | 7 | it under the terms of the GNU General Public License as published by |
8 | the Free Software Foundation; either version 2 of the License, or | 8 | the Free Software Foundation; either version 2 of the License, or |
9 | (at your option) any later version. | 9 | (at your option) any later version. |
10 | 10 | ||
11 | This program is distributed in the hope that it will be useful, | 11 | This program is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | GNU General Public License for more details. | 14 | GNU General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU General Public License | 16 | You should have received a copy of the GNU General Public License |
17 | along with this program; if not, write to the Free Software | 17 | along with this program; if not, write to the Free Software |
18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | As a special exception, permission is given to link this program | 20 | As a special exception, permission is given to link this program |
21 | with any edition of Qt, and distribute the resulting executable, | 21 | with any edition of Qt, and distribute the resulting executable, |
22 | without including the source ode for Qt in the source distribution. | 22 | without including the source ode for Qt in the source distribution. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <qevent.h> | 25 | #include <qevent.h> |
26 | #include <qpainter.h> | 26 | #include <qpainter.h> |
27 | #include <qptrlist.h> | 27 | #include <qptrlist.h> |
28 | #include <qtimer.h> | 28 | #include <qtimer.h> |
29 | #include <qwhatsthis.h> | 29 | #include <qwhatsthis.h> |
30 | 30 | ||
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kdebug.h> | 32 | #include <kdebug.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | 34 | ||
35 | #include <libkcal/vcaldrag.h> | 35 | #include <libkcal/vcaldrag.h> |
36 | #include <libkcal/icaldrag.h> | 36 | #include <libkcal/icaldrag.h> |
37 | #include <libkcal/dndfactory.h> | 37 | #include <libkcal/dndfactory.h> |
38 | #include <libkcal/calendarresources.h> | 38 | #include <libkcal/calendarresources.h> |
39 | #include <libkcal/resourcecalendar.h> | 39 | #include <libkcal/resourcecalendar.h> |
40 | #include <kresources/resourceselectdialog.h> | 40 | #include <kresources/resourceselectdialog.h> |
41 | 41 | ||
42 | #include <kcalendarsystem.h> | 42 | #include <kcalendarsystem.h> |
43 | 43 | ||
44 | #ifndef KORG_NOPLUGINS | 44 | #ifndef KORG_NOPLUGINS |
45 | #include "kocore.h" | 45 | #include "kocore.h" |
46 | #endif | 46 | #endif |
47 | #include "koprefs.h" | 47 | #include "koprefs.h" |
48 | #include "koglobals.h" | 48 | #include "koglobals.h" |
49 | 49 | ||
50 | #include "kodaymatrix.h" | 50 | #include "kodaymatrix.h" |
51 | 51 | ||
52 | // ============================================================================ | 52 | // ============================================================================ |
53 | // D Y N A M I C T I P | 53 | // D Y N A M I C T I P |
54 | // ============================================================================ | 54 | // ============================================================================ |
55 | 55 | ||
56 | DynamicTip::DynamicTip( QWidget * parent ) | 56 | DynamicTip::DynamicTip( QWidget * parent ) |
57 | : QToolTip( parent ) | 57 | : QToolTip( parent ) |
58 | { | 58 | { |
59 | matrix = (KODayMatrix*)parent; | 59 | matrix = (KODayMatrix*)parent; |
60 | } | 60 | } |
61 | 61 | ||
62 | class KODaymatrixWhatsThis :public QWhatsThis | 62 | class KODaymatrixWhatsThis :public QWhatsThis |
63 | { | 63 | { |
64 | public: | 64 | public: |
65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; | 65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; |
66 | ~KODaymatrixWhatsThis() { ; }; | 66 | ~KODaymatrixWhatsThis() { qDebug("DELETE KODaymatrixWhatsThis "); }; |
67 | 67 | ||
68 | protected: | 68 | protected: |
69 | virtual QString text( const QPoint& p ) | 69 | virtual QString text( const QPoint& p ) |
70 | { | 70 | { |
71 | return _view->getWhatsThisText( p ) ; | 71 | return _view->getWhatsThisText( p ) ; |
72 | } | 72 | } |
73 | private: | 73 | private: |
74 | KODayMatrix * _view; | 74 | KODayMatrix * _view; |
75 | }; | 75 | }; |
76 | 76 | ||
77 | void DynamicTip::maybeTip( const QPoint &pos ) | 77 | void DynamicTip::maybeTip( const QPoint &pos ) |
78 | { | 78 | { |
79 | //calculate which cell of the matrix the mouse is in | 79 | //calculate which cell of the matrix the mouse is in |
80 | QRect sz = matrix->frameRect(); | 80 | QRect sz = matrix->frameRect(); |
81 | int dheight = sz.height()*7 / 42; | 81 | int dheight = sz.height()*7 / 42; |
82 | int dwidth = sz.width() / 7; | 82 | int dwidth = sz.width() / 7; |
83 | int row = pos.y()/dheight; | 83 | int row = pos.y()/dheight; |
84 | int col = pos.x()/dwidth; | 84 | int col = pos.x()/dwidth; |
85 | 85 | ||
86 | QRect rct(col*dwidth, row*dheight, dwidth, dheight); | 86 | QRect rct(col*dwidth, row*dheight, dwidth, dheight); |
87 | 87 | ||
88 | // kdDebug() << "DynamicTip::maybeTip matrix cell index [" << | 88 | // kdDebug() << "DynamicTip::maybeTip matrix cell index [" << |
89 | // col << "][" << row << "] => " <<(col+row*7) << endl; | 89 | // col << "][" << row << "] => " <<(col+row*7) << endl; |
90 | 90 | ||
91 | //show holiday names only | 91 | //show holiday names only |
92 | QString str = matrix->getHolidayLabel(col+row*7); | 92 | QString str = matrix->getHolidayLabel(col+row*7); |
93 | if (str.isEmpty()) return; | 93 | if (str.isEmpty()) return; |
94 | tip(rct, str); | 94 | tip(rct, str); |
95 | } | 95 | } |
96 | 96 | ||
97 | 97 | ||
98 | // ============================================================================ | 98 | // ============================================================================ |
99 | // K O D A Y M A T R I X | 99 | // K O D A Y M A T R I X |
100 | // ============================================================================ | 100 | // ============================================================================ |
101 | 101 | ||
102 | const int KODayMatrix::NOSELECTION = -1000; | 102 | const int KODayMatrix::NOSELECTION = -1000; |
103 | const int KODayMatrix::NUMDAYS = 42; | 103 | const int KODayMatrix::NUMDAYS = 42; |
104 | 104 | ||
105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) | 105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) |
106 | : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 ) | 106 | : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 ) |
107 | 107 | ||
108 | #if 0 | 108 | |
109 | KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) : | ||
110 | QFrame(parent, name) | ||
111 | #endif | ||
112 | { | 109 | { |
110 | mLastView = -1; | ||
113 | oldW = 0; | 111 | oldW = 0; |
114 | oldH = 0; | 112 | oldH = 0; |
115 | myPix.resize( 150, 120 ); | 113 | myPix.resize( 150, 120 ); |
116 | mRedrawNeeded = true; | 114 | mRedrawNeeded = true; |
117 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); | 115 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); |
118 | mPendingUpdateBeforeRepaint = false; | 116 | mPendingUpdateBeforeRepaint = false; |
119 | mouseDown = false; | 117 | mouseDown = false; |
120 | // initialize dynamic arrays | 118 | // initialize dynamic arrays |
121 | bDays.resize ( NUMDAYS ); | 119 | bDays.resize ( NUMDAYS ); |
122 | pDays.resize ( NUMDAYS ); | 120 | pDays.resize ( NUMDAYS ); |
123 | hDays.resize ( NUMDAYS ); | 121 | hDays.resize ( NUMDAYS ); |
124 | eDays.resize ( NUMDAYS ); | 122 | eDays.resize ( NUMDAYS ); |
125 | days = new QDate[NUMDAYS]; | 123 | days = new QDate[NUMDAYS]; |
126 | daylbls = new QString[NUMDAYS]; | 124 | daylbls = new QString[NUMDAYS]; |
127 | //events = new int[NUMDAYS]; | 125 | //events = new int[NUMDAYS]; |
128 | mToolTip = new DynamicTip(this); | 126 | mToolTip = new DynamicTip(this); |
129 | 127 | ||
130 | // set default values used for drawing the matrix | 128 | // set default values used for drawing the matrix |
131 | mDefaultBackColor = palette().active().base(); | 129 | mDefaultBackColor = palette().active().base(); |
132 | mDefaultTextColor = palette().active().foreground(); | 130 | mDefaultTextColor = palette().active().foreground(); |
133 | mDefaultTextColorShaded = getShadedColor(mDefaultTextColor); | 131 | mDefaultTextColorShaded = getShadedColor(mDefaultTextColor); |
134 | mHolidayColorShaded = getShadedColor(KOPrefs::instance()->mHolidayColor); | 132 | mHolidayColorShaded = getShadedColor(KOPrefs::instance()->mHolidayColor); |
135 | mSelectedDaysColor = QColor("white"); | 133 | mSelectedDaysColor = QColor("white"); |
136 | mTodayMarginWidth = 2; | 134 | mTodayMarginWidth = 2; |
137 | mSelEnd = mSelStart = NOSELECTION; | 135 | mSelEnd = mSelStart = NOSELECTION; |
138 | 136 | ||
139 | setAcceptDrops(true); | 137 | setAcceptDrops(true); |
140 | //setFont( QFont("Arial", 10) ); | 138 | //setFont( QFont("Arial", 10) ); |
141 | 139 | ||
142 | mUpdateTimer = new QTimer( this ); | 140 | mUpdateTimer = new QTimer( this ); |
143 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( updateViewTimed() )); | 141 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( updateViewTimed() )); |
144 | mRepaintTimer = new QTimer( this ); | 142 | mRepaintTimer = new QTimer( this ); |
145 | connect (mRepaintTimer ,SIGNAL(timeout()), this, SLOT ( repaintViewTimed() )); | 143 | connect (mRepaintTimer ,SIGNAL(timeout()), this, SLOT ( repaintViewTimed() )); |
146 | mDayChanged = false; | 144 | mDayChanged = false; |
147 | updateView(); | 145 | updateView(); |
148 | } | 146 | } |
149 | QString KODayMatrix::getWhatsThisText( QPoint p ) | 147 | QString KODayMatrix::getWhatsThisText( QPoint p ) |
150 | { | 148 | { |
151 | 149 | ||
152 | int tmp = getDayIndexFrom(p.x(), p.y()); | 150 | int tmp = getDayIndexFrom(p.x(), p.y()); |
153 | if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar ) | 151 | if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar ) |
154 | return QString(); | 152 | return QString(); |
155 | QDate mDate = days[tmp]; | 153 | QDate mDate = days[tmp]; |
156 | QPtrList<Event> eventlist = mCalendar->events(mDate); | 154 | QPtrList<Event> eventlist = mCalendar->events(mDate); |
157 | Event *event; | 155 | Event *event; |
158 | QStringList mToolTip; | 156 | QStringList mToolTip; |
159 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | 157 | for(event=eventlist.first();event != 0;event=eventlist.next()) { |
160 | QString mToolTipText; | 158 | QString mToolTipText; |
161 | QString text; | 159 | QString text; |
162 | int multiday = 0;// 1 = start, 2 = midddle, 3 = end day | 160 | int multiday = 0;// 1 = start, 2 = midddle, 3 = end day |
163 | if (event->isMultiDay()) { | 161 | if (event->isMultiDay()) { |
164 | QString prefix = "<->";multiday = 2; | 162 | QString prefix = "<->";multiday = 2; |
165 | QString time; | 163 | QString time; |
166 | if ( event->doesRecur() ) { | 164 | if ( event->doesRecur() ) { |
167 | if ( event->recursOn( mDate) ) { | 165 | if ( event->recursOn( mDate) ) { |
168 | prefix ="->" ;multiday = 1; | 166 | prefix ="->" ;multiday = 1; |
169 | } | 167 | } |
170 | else { | 168 | else { |
171 | int days = event->dtStart().date().daysTo ( event->dtEnd().date() ); | 169 | int days = event->dtStart().date().daysTo ( event->dtEnd().date() ); |
172 | if ( event->recursOn( mDate.addDays( -days)) ) { | 170 | if ( event->recursOn( mDate.addDays( -days)) ) { |
173 | prefix ="<-" ;multiday = 3; | 171 | prefix ="<-" ;multiday = 3; |
174 | } | 172 | } |
175 | } | 173 | } |
176 | } else { | 174 | } else { |
177 | if (mDate == event->dtStart().date()) { | 175 | if (mDate == event->dtStart().date()) { |
178 | prefix ="->" ;multiday = 1; | 176 | prefix ="->" ;multiday = 1; |
179 | } else if (mDate == event->dtEnd().date()) { | 177 | } else if (mDate == event->dtEnd().date()) { |
180 | prefix ="<-" ;multiday = 3; | 178 | prefix ="<-" ;multiday = 3; |
181 | } | 179 | } |
182 | } | 180 | } |
183 | if ( !event->doesFloat() ) { | 181 | if ( !event->doesFloat() ) { |
184 | if ( mDate == event->dtStart().date () ) | 182 | if ( mDate == event->dtStart().date () ) |
185 | time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; | 183 | time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; |
186 | else if ( mDate == event->dtEnd().date () ) | 184 | else if ( mDate == event->dtEnd().date () ) |
187 | time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; | 185 | time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; |
188 | 186 | ||
189 | } | 187 | } |
190 | text = time + event->summary(); | 188 | text = time + event->summary(); |
191 | mToolTipText += prefix + text; | 189 | mToolTipText += prefix + text; |
192 | } else { | 190 | } else { |
193 | if (event->doesFloat()) { | 191 | if (event->doesFloat()) { |
194 | text = event->summary(); | 192 | text = event->summary(); |
195 | mToolTipText += text; | 193 | mToolTipText += text; |
196 | } | 194 | } |
197 | else { | 195 | else { |
198 | text = KGlobal::locale()->formatTime(event->dtStart().time()); | 196 | text = KGlobal::locale()->formatTime(event->dtStart().time()); |
199 | text += " " + event->summary(); | 197 | text += " " + event->summary(); |
200 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | 198 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); |
201 | } | 199 | } |
202 | } | 200 | } |
203 | if ( !event->location().isEmpty() ) | 201 | if ( !event->location().isEmpty() ) |
204 | mToolTipText += " (" + event->location() + ")"; | 202 | mToolTipText += " (" + event->location() + ")"; |
205 | #if QT_VERSION >= 0x030000 | 203 | #if QT_VERSION >= 0x030000 |
206 | mToolTipText.replace( '<' , "<" ); | 204 | mToolTipText.replace( '<' , "<" ); |
207 | mToolTipText.replace( '>' , ">" ); | 205 | mToolTipText.replace( '>' , ">" ); |
208 | #else | 206 | #else |
209 | if ( mToolTipText.find ('<') >= 0 ) { | 207 | if ( mToolTipText.find ('<') >= 0 ) { |
210 | mToolTipText.replace( QRegExp("<") , "<" ); | 208 | mToolTipText.replace( QRegExp("<") , "<" ); |
211 | } | 209 | } |
212 | if ( mToolTipText.find ('>') >= 0 ) { | 210 | if ( mToolTipText.find ('>') >= 0 ) { |
213 | mToolTipText.replace( QRegExp(">") , ">" ); | 211 | mToolTipText.replace( QRegExp(">") , ">" ); |
214 | } | 212 | } |
215 | #endif | 213 | #endif |
216 | //qDebug("TTT: %s ", mToolTipText.latin1()); | 214 | //qDebug("TTT: %s ", mToolTipText.latin1()); |
217 | mToolTip.append( mToolTipText ); | 215 | mToolTip.append( mToolTipText ); |
218 | } | 216 | } |
219 | mToolTip.sort(); | 217 | mToolTip.sort(); |
220 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); | 218 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); |
221 | } | 219 | } |
222 | void KODayMatrix::setCalendar( Calendar *cal ) | 220 | void KODayMatrix::setCalendar( Calendar *cal ) |
223 | { | 221 | { |
224 | mCalendar = cal; | 222 | mCalendar = cal; |
225 | 223 | ||
226 | setAcceptDrops( mCalendar ); | 224 | setAcceptDrops( mCalendar ); |
227 | 225 | ||
228 | updateEvents(); | 226 | updateEvents(); |
229 | } | 227 | } |
230 | 228 | ||
231 | QColor KODayMatrix::getShadedColor(QColor color) | 229 | QColor KODayMatrix::getShadedColor(QColor color) |
232 | { | 230 | { |
233 | QColor shaded; | 231 | QColor shaded; |
234 | int h=0; | 232 | int h=0; |
235 | int s=0; | 233 | int s=0; |
236 | int v=0; | 234 | int v=0; |
237 | color.hsv(&h,&s,&v); | 235 | color.hsv(&h,&s,&v); |
238 | s = s/4; | 236 | s = s/4; |
239 | v = 192+v/4; | 237 | v = 192+v/4; |
240 | shaded.setHsv(h,s,v); | 238 | shaded.setHsv(h,s,v); |
241 | 239 | ||
242 | return shaded; | 240 | return shaded; |
243 | } | 241 | } |
244 | 242 | ||
245 | KODayMatrix::~KODayMatrix() | 243 | KODayMatrix::~KODayMatrix() |
246 | { | 244 | { |
245 | #if QT_VERSION >= 0x030000 | ||
246 | |||
247 | #else | ||
248 | delete mKODaymatrixWhatsThis; | ||
249 | #endif | ||
250 | |||
247 | // delete mKODaymatrixWhatsThis; | 251 | // delete mKODaymatrixWhatsThis; |
248 | delete [] days; | 252 | delete [] days; |
249 | delete [] daylbls; | 253 | delete [] daylbls; |
250 | //delete [] events; | 254 | //delete [] events; |
251 | delete mToolTip; | 255 | delete mToolTip; |
252 | } | 256 | } |
253 | 257 | ||
254 | /* | 258 | /* |
255 | void KODayMatrix::setStartDate(QDate start) | 259 | void KODayMatrix::setStartDate(QDate start) |
256 | { | 260 | { |
257 | updateView(start); | 261 | updateView(start); |
258 | } | 262 | } |
259 | */ | 263 | */ |
260 | 264 | ||
261 | void KODayMatrix::addSelectedDaysTo(DateList& selDays) | 265 | void KODayMatrix::addSelectedDaysTo(DateList& selDays) |
262 | { | 266 | { |
263 | 267 | ||
264 | if (mSelStart == NOSELECTION) { | 268 | if (mSelStart == NOSELECTION) { |
265 | return; | 269 | return; |
266 | } | 270 | } |
267 | 271 | ||
268 | //cope with selection being out of matrix limits at top (< 0) | 272 | //cope with selection being out of matrix limits at top (< 0) |
269 | int i0 = mSelStart; | 273 | int i0 = mSelStart; |
270 | if (i0 < 0) { | 274 | if (i0 < 0) { |
271 | for (int i = i0; i < 0; i++) { | 275 | for (int i = i0; i < 0; i++) { |
272 | selDays.append(days[0].addDays(i)); | 276 | selDays.append(days[0].addDays(i)); |
273 | } | 277 | } |
274 | i0 = 0; | 278 | i0 = 0; |
275 | } | 279 | } |
276 | 280 | ||
277 | //cope with selection being out of matrix limits at bottom (> NUMDAYS-1) | 281 | //cope with selection being out of matrix limits at bottom (> NUMDAYS-1) |
278 | if (mSelEnd > NUMDAYS-1) { | 282 | if (mSelEnd > NUMDAYS-1) { |
279 | for (int i = i0; i <= NUMDAYS-1; i++) { | 283 | for (int i = i0; i <= NUMDAYS-1; i++) { |
280 | selDays.append(days[i]); | 284 | selDays.append(days[i]); |
281 | } | 285 | } |
282 | for (int i = NUMDAYS; i < mSelEnd; i++) { | 286 | for (int i = NUMDAYS; i < mSelEnd; i++) { |
283 | selDays.append(days[0].addDays(i)); | 287 | selDays.append(days[0].addDays(i)); |
284 | } | 288 | } |
285 | 289 | ||
286 | // apply normal routine to selection being entirely within matrix limits | 290 | // apply normal routine to selection being entirely within matrix limits |
287 | } else { | 291 | } else { |
288 | for (int i = i0; i <= mSelEnd; i++) { | 292 | for (int i = i0; i <= mSelEnd; i++) { |
289 | selDays.append(days[i]); | 293 | selDays.append(days[i]); |
290 | } | 294 | } |
291 | } | 295 | } |
292 | } | 296 | } |
293 | 297 | ||
294 | bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end) | 298 | bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end) |
295 | { | 299 | { |
296 | mRedrawNeeded = true; | 300 | mRedrawNeeded = true; |
297 | bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION ); | 301 | bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION ); |
298 | mSelStart = startdate.daysTo(start); | 302 | mSelStart = startdate.daysTo(start); |
299 | if ( mSelStart < 0 ) | 303 | if ( mSelStart < 0 ) |
300 | mSelStart = 0; | 304 | mSelStart = 0; |
301 | mSelEnd = startdate.daysTo(end); | 305 | mSelEnd = startdate.daysTo(end); |
302 | if ( mSelEnd > NUMDAYS-1 ) | 306 | if ( mSelEnd > NUMDAYS-1 ) |
303 | mSelEnd = NUMDAYS-1; | 307 | mSelEnd = NUMDAYS-1; |
304 | if ( mSelEnd < 0 || mSelStart > NUMDAYS-1 ) { | 308 | if ( mSelEnd < 0 || mSelStart > NUMDAYS-1 ) { |
305 | clearSelection(); | 309 | clearSelection(); |
306 | if ( noSel ) | 310 | if ( noSel ) |
307 | return false; | 311 | return false; |
308 | } | 312 | } |
309 | 313 | ||
310 | return true; | 314 | return true; |
311 | } | 315 | } |
312 | void KODayMatrix::clearSelection() | 316 | void KODayMatrix::clearSelection() |
313 | { | 317 | { |
314 | mSelEnd = mSelStart = NOSELECTION; | 318 | mSelEnd = mSelStart = NOSELECTION; |
315 | } | 319 | } |
316 | 320 | ||
317 | 321 | ||
318 | void KODayMatrix::recalculateToday() | 322 | void KODayMatrix::recalculateToday() |
319 | { | 323 | { |
320 | today = -1; | 324 | today = -1; |
321 | for (int i=0; i<NUMDAYS; i++) { | 325 | for (int i=0; i<NUMDAYS; i++) { |
322 | //events[i] = 0; | 326 | //events[i] = 0; |
323 | days[i] = startdate.addDays(i); | 327 | days[i] = startdate.addDays(i); |
324 | daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] )); | 328 | daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] )); |
325 | 329 | ||
326 | // if today is in the currently displayed month, hilight today | 330 | // if today is in the currently displayed month, hilight today |
327 | if (days[i].year() == QDate::currentDate().year() && | 331 | if (days[i].year() == QDate::currentDate().year() && |
328 | days[i].month() == QDate::currentDate().month() && | 332 | days[i].month() == QDate::currentDate().month() && |
329 | days[i].day() == QDate::currentDate().day()) { | 333 | days[i].day() == QDate::currentDate().day()) { |
330 | today = i; | 334 | today = i; |
331 | } | 335 | } |
332 | } | 336 | } |
333 | // qDebug(QString("Today is visible at %1.").arg(today)); | 337 | // qDebug(QString("Today is visible at %1.").arg(today)); |
334 | } | 338 | } |
335 | 339 | ||
336 | void KODayMatrix::updateView() | 340 | void KODayMatrix::updateView() |
337 | { | 341 | { |
338 | updateView(startdate); | 342 | updateView(startdate); |
339 | } | 343 | } |
340 | void KODayMatrix::repaintViewTimed() | 344 | void KODayMatrix::repaintViewTimed() |
341 | { | 345 | { |
342 | mRedrawNeeded = true; | 346 | mRedrawNeeded = true; |
343 | // bDays.fill( false); | 347 | // bDays.fill( false); |
344 | //pDays.fill( false); | 348 | //pDays.fill( false); |
345 | //hDays.fill( false); | 349 | //hDays.fill( false); |
346 | //eDays.fill( false); | 350 | //eDays.fill( false); |
347 | mRepaintTimer->stop(); | 351 | mRepaintTimer->stop(); |
348 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday | 352 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday |
349 | int i; | 353 | int i; |
350 | for(i = 0; i < NUMDAYS; i++) { | 354 | for(i = 0; i < NUMDAYS; i++) { |
351 | if ( ( (i+startDay) % 7 == 0 ) ) { | 355 | if ( ( (i+startDay) % 7 == 0 ) ) { |
352 | pDays.setBit(i); | 356 | pDays.setBit(i); |
353 | } | 357 | } |
354 | } | 358 | } |
355 | repaint(false); | 359 | repaint(false); |
356 | } | 360 | } |
357 | void KODayMatrix::computeEvent(Event *event, int i ) | 361 | void KODayMatrix::computeEvent(Event *event, int i ) |
358 | { | 362 | { |
359 | QString holiStr = mHolidays[i]; | 363 | QString holiStr = mHolidays[i]; |
360 | if ( event->isHoliday()) { | 364 | if ( event->isHoliday()) { |
361 | pDays.setBit(i); | 365 | pDays.setBit(i); |
362 | hDays.setBit(i); | 366 | hDays.setBit(i); |
363 | if ( !holiStr.isEmpty() ) | 367 | if ( !holiStr.isEmpty() ) |
364 | holiStr += "\n"; | 368 | holiStr += "\n"; |
365 | holiStr += event->summary(); | 369 | holiStr += event->summary(); |
366 | if ( !event->location().isEmpty() ) | 370 | if ( !event->location().isEmpty() ) |
367 | holiStr += " (" + event->location() + ")"; | 371 | holiStr += " (" + event->location() + ")"; |
368 | mHolidays[i] =holiStr ; | 372 | mHolidays[i] =holiStr ; |
369 | eDays.setBit(i); | 373 | eDays.setBit(i); |
370 | } | 374 | } |
371 | if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_T_VIEW && KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) { | 375 | if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_T_VIEW && KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) { |
372 | if ( event->isBirthday()) { | 376 | if ( event->isBirthday()) { |
373 | pDays.setBit(i); | 377 | pDays.setBit(i); |
374 | if ( !holiStr.isEmpty() ) | 378 | if ( !holiStr.isEmpty() ) |
375 | holiStr += "\n"; | 379 | holiStr += "\n"; |
376 | holiStr += i18n("Birthday") + ": "+event->summary(); | 380 | holiStr += i18n("Birthday") + ": "+event->summary(); |
377 | if ( !event->location().isEmpty() ) | 381 | if ( !event->location().isEmpty() ) |
378 | holiStr += " (" + event->location() + ")"; | 382 | holiStr += " (" + event->location() + ")"; |
379 | bDays.setBit(i); | 383 | bDays.setBit(i); |
380 | mHolidays[i] =holiStr ; | 384 | mHolidays[i] =holiStr ; |
381 | } | 385 | } |
382 | } | 386 | } |
383 | if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) | 387 | if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) |
384 | eDays.setBit(i); | 388 | eDays.setBit(i); |
385 | } | 389 | } |
386 | void KODayMatrix::updateViewTimed() | 390 | void KODayMatrix::updateViewTimed() |
387 | { | 391 | { |
388 | mUpdateTimer->stop(); | 392 | mUpdateTimer->stop(); |
389 | if ( !mCalendar ) { | 393 | if ( !mCalendar ) { |
390 | qDebug("NOT CAL "); | 394 | qDebug("NOT CAL "); |
391 | return; | 395 | return; |
392 | } | 396 | } |
393 | #if 1 | 397 | #if 1 |
394 | 398 | ||
395 | 399 | ||
396 | int i; | 400 | int i; |
397 | int timeSpan = NUMDAYS-1; | 401 | int timeSpan = NUMDAYS-1; |
398 | QPtrList<Event> events = mCalendar->events(); | 402 | QPtrList<Event> events = mCalendar->events(); |
399 | Event *event; | 403 | Event *event; |
400 | QDateTime dt; | 404 | QDateTime dt; |
401 | bool ok; | 405 | bool ok; |
402 | bDays.fill( false); | 406 | bDays.fill( false); |
403 | pDays.fill( false); | 407 | pDays.fill( false); |
404 | hDays.fill( false); | 408 | hDays.fill( false); |
405 | eDays.fill( false); | 409 | eDays.fill( false); |
406 | mHolidays.clear(); | 410 | mHolidays.clear(); |
407 | QDate mStartDate = days[0]; | 411 | QDate mStartDate = days[0]; |
408 | QDate endDate = mStartDate.addDays( timeSpan ); | 412 | QDate endDate = mStartDate.addDays( timeSpan ); |
409 | for( event = events.first(); event; event = events.next() ) { // for event | 413 | for( event = events.first(); event; event = events.next() ) { // for event |
410 | ushort recurType = event->recurrence()->doesRecur(); | 414 | ushort recurType = event->recurrence()->doesRecur(); |
411 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || | 415 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || |
412 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { | 416 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { |
413 | continue; | 417 | continue; |
414 | } | 418 | } |
415 | if ( event->doesRecur() ) { | 419 | if ( event->doesRecur() ) { |
416 | bool last; | 420 | bool last; |
417 | QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); | 421 | QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); |
418 | QDateTime incidenceEnd; | 422 | QDateTime incidenceEnd; |
419 | int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); | 423 | int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); |
420 | bool invalid = false; | 424 | bool invalid = false; |
421 | while( true ) { | 425 | while( true ) { |
422 | if ( incidenceStart.isValid() ) { | 426 | if ( incidenceStart.isValid() ) { |
423 | incidenceEnd = incidenceStart.addDays( eventlen ); | 427 | incidenceEnd = incidenceStart.addDays( eventlen ); |
424 | int st = incidenceStart.date().daysTo( endDate ); | 428 | int st = incidenceStart.date().daysTo( endDate ); |
425 | if ( st >= 0 ) { // start before timeend | 429 | if ( st >= 0 ) { // start before timeend |
426 | int end = mStartDate.daysTo( incidenceEnd.date() ); | 430 | int end = mStartDate.daysTo( incidenceEnd.date() ); |
427 | if ( end >= 0 ) { // end after timestart --- got one! | 431 | if ( end >= 0 ) { // end after timestart --- got one! |
428 | //normalize | 432 | //normalize |
429 | st = timeSpan - st; | 433 | st = timeSpan - st; |
430 | if ( st < 0 ) st = 0; | 434 | if ( st < 0 ) st = 0; |
431 | if ( end > timeSpan ) end = timeSpan; | 435 | if ( end > timeSpan ) end = timeSpan; |
432 | int iii; | 436 | int iii; |
433 | //qDebug("found %s %d %d ",event->summary().latin1(), st, end ); | 437 | //qDebug("found %s %d %d ",event->summary().latin1(), st, end ); |
434 | for ( iii = st;iii<= end;++iii) { | 438 | for ( iii = st;iii<= end;++iii) { |
435 | computeEvent( event, iii ); | 439 | computeEvent( event, iii ); |
436 | } | 440 | } |
437 | } | 441 | } |
438 | } | 442 | } |
439 | } else { | 443 | } else { |
440 | if ( invalid ) | 444 | if ( invalid ) |
441 | break; | 445 | break; |
442 | invalid = true; | 446 | invalid = true; |
443 | //qDebug("invalid %s", event->summary().latin1()); | 447 | //qDebug("invalid %s", event->summary().latin1()); |
444 | incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; | 448 | incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; |
445 | } | 449 | } |
446 | if ( last ) | 450 | if ( last ) |
447 | break; | 451 | break; |
448 | bool ok; | 452 | bool ok; |
449 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); | 453 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); |
450 | if ( ! ok ) | 454 | if ( ! ok ) |
451 | break; | 455 | break; |
452 | if ( incidenceStart.date() > endDate ) | 456 | if ( incidenceStart.date() > endDate ) |
453 | break; | 457 | break; |
454 | } | 458 | } |
455 | } else { // no recur | 459 | } else { // no recur |
456 | int st = event->dtStart().date().daysTo( endDate ); | 460 | int st = event->dtStart().date().daysTo( endDate ); |
457 | if ( st >= 0 ) { // start before timeend | 461 | if ( st >= 0 ) { // start before timeend |
458 | int end = mStartDate.daysTo( event->dtEnd().date() ); | 462 | int end = mStartDate.daysTo( event->dtEnd().date() ); |
459 | if ( end >= 0 ) { // end after timestart --- got one! | 463 | if ( end >= 0 ) { // end after timestart --- got one! |
460 | //normalize | 464 | //normalize |
461 | st = timeSpan - st; | 465 | st = timeSpan - st; |
462 | if ( st < 0 ) st = 0; | 466 | if ( st < 0 ) st = 0; |
463 | if ( end > timeSpan ) end = timeSpan; | 467 | if ( end > timeSpan ) end = timeSpan; |
464 | int iii; | 468 | int iii; |
465 | for ( iii = st;iii<= end;++iii) | 469 | for ( iii = st;iii<= end;++iii) |
466 | computeEvent( event, iii ); | 470 | computeEvent( event, iii ); |
467 | } | 471 | } |
468 | } | 472 | } |
469 | } | 473 | } |
470 | } | 474 | } |
471 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday | 475 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday |
472 | for(i = 0; i < NUMDAYS; i++) { | 476 | for(i = 0; i < NUMDAYS; i++) { |
473 | if ( ( (i+startDay) % 7 == 0 ) ) { | 477 | if ( ( (i+startDay) % 7 == 0 ) ) { |
474 | pDays.setBit(i); | 478 | pDays.setBit(i); |
475 | } | 479 | } |
476 | } | 480 | } |
477 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { | 481 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { |
478 | bDays.fill( false); | 482 | bDays.fill( false); |
479 | // insert due todos | 483 | // insert due todos |
480 | QPtrList<Todo> todos = mCalendar->todos( ); | 484 | QPtrList<Todo> todos = mCalendar->todos( ); |
481 | Todo *todo; | 485 | Todo *todo; |
482 | for(todo = todos.first(); todo; todo = todos.next()) { | 486 | for(todo = todos.first(); todo; todo = todos.next()) { |
483 | //insertTodo( todo ); | 487 | //insertTodo( todo ); |
484 | if ( todo->hasDueDate() ) { | 488 | if ( todo->hasDueDate() ) { |
485 | int day = mStartDate.daysTo( todo->dtDue().date() ); | 489 | int day = mStartDate.daysTo( todo->dtDue().date() ); |
486 | if ( day >= 0 && day < timeSpan + 1) { | 490 | if ( day >= 0 && day < timeSpan + 1) { |
487 | int i = day; | 491 | int i = day; |
488 | QString holiStr = mHolidays[i]; | 492 | QString holiStr = mHolidays[i]; |
489 | pDays.setBit(i); | 493 | pDays.setBit(i); |
490 | if ( !holiStr.isEmpty() ) | 494 | if ( !holiStr.isEmpty() ) |
491 | holiStr += "\n"; | 495 | holiStr += "\n"; |
492 | holiStr += i18n("Todo") + ": "+todo->summary(); | 496 | holiStr += i18n("Todo") + ": "+todo->summary(); |
493 | if ( !todo->location().isEmpty() ) | 497 | if ( !todo->location().isEmpty() ) |
494 | holiStr += " (" + todo->location() + ")"; | 498 | holiStr += " (" + todo->location() + ")"; |
495 | bDays.setBit(i); | 499 | bDays.setBit(i); |
496 | mHolidays[i] =holiStr ; | 500 | mHolidays[i] =holiStr ; |
497 | eDays.setBit(i); | 501 | eDays.setBit(i); |
498 | } | 502 | } |
499 | } | 503 | } |
500 | } | 504 | } |
501 | } | 505 | } |
502 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { | 506 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index d9d7924..e4bee63 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -775,516 +775,512 @@ void KOPrefsDialog::setupViewsTab() | |||
775 | &(KOPrefs::instance()->mEnableMonthScroll),topFrame); | 775 | &(KOPrefs::instance()->mEnableMonthScroll),topFrame); |
776 | topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); | 776 | topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); |
777 | #endif | 777 | #endif |
778 | dummy = | 778 | dummy = |
779 | addWidBool(i18n("Week view mode uses bigger font"), | 779 | addWidBool(i18n("Week view mode uses bigger font"), |
780 | &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame); | 780 | &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame); |
781 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 781 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
782 | dummy = | 782 | dummy = |
783 | addWidBool(i18n("Show Sat/Sun together"), | 783 | addWidBool(i18n("Show Sat/Sun together"), |
784 | &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); | 784 | &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); |
785 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 785 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
786 | 786 | ||
787 | KPrefsDialogWidBool *coloredCategoriesInMonthView = | 787 | KPrefsDialogWidBool *coloredCategoriesInMonthView = |
788 | addWidBool(i18n("Month view uses category colors"), | 788 | addWidBool(i18n("Month view uses category colors"), |
789 | &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); | 789 | &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); |
790 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); | 790 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); |
791 | 791 | ||
792 | dummy = | 792 | dummy = |
793 | addWidBool(i18n("Categorie colors are applied to text"), | 793 | addWidBool(i18n("Categorie colors are applied to text"), |
794 | &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); | 794 | &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); |
795 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 795 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
796 | coloredCategoriesInMonthView = | 796 | coloredCategoriesInMonthView = |
797 | addWidBool(i18n("Month view uses day colors"), | 797 | addWidBool(i18n("Month view uses day colors"), |
798 | &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); | 798 | &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); |
799 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); | 799 | topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); |
800 | 800 | ||
801 | KPrefsDialogWidColor *holidayColor = | 801 | KPrefsDialogWidColor *holidayColor = |
802 | addWidColor(i18n("Day color odd months"), | 802 | addWidColor(i18n("Day color odd months"), |
803 | &(KOPrefs::instance()->mMonthViewOddColor),topFrame); | 803 | &(KOPrefs::instance()->mMonthViewOddColor),topFrame); |
804 | topLayout->addWidget(holidayColor->label(),ii,0); | 804 | topLayout->addWidget(holidayColor->label(),ii,0); |
805 | topLayout->addWidget(holidayColor->button(),ii++,1); | 805 | topLayout->addWidget(holidayColor->button(),ii++,1); |
806 | 806 | ||
807 | holidayColor = | 807 | holidayColor = |
808 | addWidColor(i18n("Day color even months"), | 808 | addWidColor(i18n("Day color even months"), |
809 | &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); | 809 | &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); |
810 | topLayout->addWidget(holidayColor->label(),ii,0); | 810 | topLayout->addWidget(holidayColor->label(),ii,0); |
811 | topLayout->addWidget(holidayColor->button(),ii++,1); | 811 | topLayout->addWidget(holidayColor->button(),ii++,1); |
812 | 812 | ||
813 | 813 | ||
814 | holidayColor = | 814 | holidayColor = |
815 | addWidColor(i18n("Color for Sundays + category \"Holiday\""), | 815 | addWidColor(i18n("Color for Sundays + category \"Holiday\""), |
816 | &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); | 816 | &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); |
817 | topLayout->addWidget(holidayColor->label(),ii,0); | 817 | topLayout->addWidget(holidayColor->label(),ii,0); |
818 | topLayout->addWidget(holidayColor->button(),ii++,1); | 818 | topLayout->addWidget(holidayColor->button(),ii++,1); |
819 | // *********************** What'sNext View | 819 | // *********************** What'sNext View |
820 | topFrame = addPage(i18n("What's Next View"),0,0); | 820 | topFrame = addPage(i18n("What's Next View"),0,0); |
821 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 821 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
822 | 822 | ||
823 | topLayout = new QGridLayout(topFrame,4,1); | 823 | topLayout = new QGridLayout(topFrame,4,1); |
824 | topLayout->setSpacing(mSpacingHint); | 824 | topLayout->setSpacing(mSpacingHint); |
825 | topLayout->setMargin(mMarginHint); | 825 | topLayout->setMargin(mMarginHint); |
826 | ii = 0; | 826 | ii = 0; |
827 | 827 | ||
828 | 828 | ||
829 | QHBox* hdummy = new QHBox(topFrame); | 829 | QHBox* hdummy = new QHBox(topFrame); |
830 | new QLabel(i18n("Days in What's Next:"),hdummy); | 830 | new QLabel(i18n("Days in What's Next:"),hdummy); |
831 | mWhatsNextSpin = new QSpinBox(1,14,1,hdummy); | 831 | mWhatsNextSpin = new QSpinBox(1,14,1,hdummy); |
832 | 832 | ||
833 | topLayout->addWidget(hdummy,ii++,0); | 833 | topLayout->addWidget(hdummy,ii++,0); |
834 | 834 | ||
835 | QHBox *prioBox = new QHBox(topFrame); | 835 | QHBox *prioBox = new QHBox(topFrame); |
836 | // intervalBox->setSpacing(mSpacingHint); | 836 | // intervalBox->setSpacing(mSpacingHint); |
837 | topLayout->addWidget(prioBox,ii++,0); | 837 | topLayout->addWidget(prioBox,ii++,0); |
838 | 838 | ||
839 | QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox); | 839 | QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox); |
840 | mPrioSpin = new QSpinBox(0,5,1,prioBox); | 840 | mPrioSpin = new QSpinBox(0,5,1,prioBox); |
841 | if ( QApplication::desktop()->width() < 300 ) | 841 | if ( QApplication::desktop()->width() < 300 ) |
842 | mPrioSpin->setFixedWidth( 40 ); | 842 | mPrioSpin->setFixedWidth( 40 ); |
843 | 843 | ||
844 | KPrefsDialogWidBool *passwdk = | 844 | KPrefsDialogWidBool *passwdk = |
845 | 845 | ||
846 | addWidBool(i18n("Show events, that are done"), | 846 | addWidBool(i18n("Show events, that are done"), |
847 | &(KOPrefs::instance()->mWNViewShowsPast),topFrame); | 847 | &(KOPrefs::instance()->mWNViewShowsPast),topFrame); |
848 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 848 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
849 | passwdk = | 849 | passwdk = |
850 | addWidBool(i18n("Show parent To-Do's"), | 850 | addWidBool(i18n("Show parent To-Do's"), |
851 | &(KOPrefs::instance()->mWNViewShowsParents),topFrame); | 851 | &(KOPrefs::instance()->mWNViewShowsParents),topFrame); |
852 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 852 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
853 | 853 | ||
854 | passwdk = | 854 | passwdk = |
855 | addWidBool(i18n("Show location"), | 855 | addWidBool(i18n("Show location"), |
856 | &(KOPrefs::instance()->mWNViewShowLocation),topFrame); | 856 | &(KOPrefs::instance()->mWNViewShowLocation),topFrame); |
857 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 857 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
858 | 858 | ||
859 | 859 | ||
860 | passwdk = | 860 | passwdk = |
861 | addWidBool(i18n("Use short date in WN+Event view"), | 861 | addWidBool(i18n("Use short date in WN+Event view"), |
862 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); | 862 | &(KOPrefs::instance()->mShortDateInViewer),topFrame); |
863 | topLayout->addWidget(passwdk->checkBox(), ii++,0); | 863 | topLayout->addWidget(passwdk->checkBox(), ii++,0); |
864 | 864 | ||
865 | 865 | ||
866 | 866 | ||
867 | 867 | ||
868 | // *********************** Todo View | 868 | // *********************** Todo View |
869 | 869 | ||
870 | topFrame = addPage(i18n("Todo View"),0,0); | 870 | topFrame = addPage(i18n("Todo View"),0,0); |
871 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 871 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
872 | 872 | ||
873 | topLayout = new QGridLayout(topFrame,4,1); | 873 | topLayout = new QGridLayout(topFrame,4,1); |
874 | topLayout->setSpacing(mSpacingHint); | 874 | topLayout->setSpacing(mSpacingHint); |
875 | topLayout->setMargin(mMarginHint); | 875 | topLayout->setMargin(mMarginHint); |
876 | ii = 0; | 876 | ii = 0; |
877 | dummy = | 877 | dummy = |
878 | addWidBool(i18n("Hide not running Todos in To-do view"), | 878 | addWidBool(i18n("Hide not running Todos in To-do view"), |
879 | &(KOPrefs::instance()->mHideNonStartedTodos),topFrame); | 879 | &(KOPrefs::instance()->mHideNonStartedTodos),topFrame); |
880 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 880 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
881 | 881 | ||
882 | 882 | ||
883 | KPrefsDialogWidBool *showCompletedTodo = | 883 | KPrefsDialogWidBool *showCompletedTodo = |
884 | addWidBool(i18n("To-do view shows completed Todos"), | 884 | addWidBool(i18n("To-do view shows completed Todos"), |
885 | &(KOPrefs::instance()->mShowCompletedTodo),topFrame); | 885 | &(KOPrefs::instance()->mShowCompletedTodo),topFrame); |
886 | topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0); | 886 | topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0); |
887 | dummy = | 887 | dummy = |
888 | addWidBool(i18n("To-do view shows complete as 'xx %'"), | 888 | addWidBool(i18n("To-do view shows complete as 'xx %'"), |
889 | &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame); | 889 | &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame); |
890 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 890 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
891 | 891 | ||
892 | dummy = | 892 | dummy = |
893 | addWidBool(i18n("Small To-do view uses smaller font"), | 893 | addWidBool(i18n("Small To-do view uses smaller font"), |
894 | &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame); | 894 | &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame); |
895 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 895 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
896 | 896 | ||
897 | 897 | ||
898 | 898 | ||
899 | dummy = | 899 | dummy = |
900 | addWidBool(i18n("Todo view uses category colors"), | 900 | addWidBool(i18n("Todo view uses category colors"), |
901 | &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame); | 901 | &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame); |
902 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 902 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
903 | 903 | ||
904 | 904 | ||
905 | QWidget* wid = new QWidget( topFrame ); | 905 | QWidget* wid = new QWidget( topFrame ); |
906 | // Todo run today color | 906 | // Todo run today color |
907 | KPrefsDialogWidColor *todoRunColor = | 907 | KPrefsDialogWidColor *todoRunColor = |
908 | addWidColor(i18n("Color for running todos:"), | 908 | addWidColor(i18n("Color for running todos:"), |
909 | &(KOPrefs::instance()->mTodoRunColor),wid); | 909 | &(KOPrefs::instance()->mTodoRunColor),wid); |
910 | QHBoxLayout *widLayout = new QHBoxLayout(wid); | 910 | QHBoxLayout *widLayout = new QHBoxLayout(wid); |
911 | widLayout->addWidget( todoRunColor->label() ); | 911 | widLayout->addWidget( todoRunColor->label() ); |
912 | widLayout->addWidget( todoRunColor->button() ); | 912 | widLayout->addWidget( todoRunColor->button() ); |
913 | topLayout->addWidget(wid,ii++,0); | 913 | topLayout->addWidget(wid,ii++,0); |
914 | 914 | ||
915 | wid = new QWidget( topFrame ); | 915 | wid = new QWidget( topFrame ); |
916 | // Todo due today color | 916 | // Todo due today color |
917 | KPrefsDialogWidColor *todoDueTodayColor = | 917 | KPrefsDialogWidColor *todoDueTodayColor = |
918 | addWidColor(i18n("Todo due today color:"), | 918 | addWidColor(i18n("Todo due today color:"), |
919 | &(KOPrefs::instance()->mTodoDueTodayColor),wid); | 919 | &(KOPrefs::instance()->mTodoDueTodayColor),wid); |
920 | widLayout = new QHBoxLayout(wid); | 920 | widLayout = new QHBoxLayout(wid); |
921 | widLayout->addWidget( todoDueTodayColor->label() ); | 921 | widLayout->addWidget( todoDueTodayColor->label() ); |
922 | widLayout->addWidget( todoDueTodayColor->button() ); | 922 | widLayout->addWidget( todoDueTodayColor->button() ); |
923 | topLayout->addWidget(wid,ii++,0); | 923 | topLayout->addWidget(wid,ii++,0); |
924 | //topLayout->addWidget(todoDueTodayColor->button(),ii++,1); | 924 | //topLayout->addWidget(todoDueTodayColor->button(),ii++,1); |
925 | 925 | ||
926 | // Todo overdue color | 926 | // Todo overdue color |
927 | wid = new QWidget( topFrame ); | 927 | wid = new QWidget( topFrame ); |
928 | widLayout = new QHBoxLayout(wid); | 928 | widLayout = new QHBoxLayout(wid); |
929 | KPrefsDialogWidColor *todoOverdueColor = | 929 | KPrefsDialogWidColor *todoOverdueColor = |
930 | addWidColor(i18n("Todo overdue color:"), | 930 | addWidColor(i18n("Todo overdue color:"), |
931 | &(KOPrefs::instance()->mTodoOverdueColor),wid); | 931 | &(KOPrefs::instance()->mTodoOverdueColor),wid); |
932 | widLayout->addWidget(todoOverdueColor->label()); | 932 | widLayout->addWidget(todoOverdueColor->label()); |
933 | widLayout->addWidget(todoOverdueColor->button()); | 933 | widLayout->addWidget(todoOverdueColor->button()); |
934 | topLayout->addWidget(wid,ii++,0); | 934 | topLayout->addWidget(wid,ii++,0); |
935 | 935 | ||
936 | dummy = | 936 | dummy = |
937 | addWidBool(i18n("Colors are applied to text"), | 937 | addWidBool(i18n("Colors are applied to text"), |
938 | &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame); | 938 | &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame); |
939 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 939 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
940 | 940 | ||
941 | dummy = | 941 | dummy = |
942 | addWidBool(i18n("Allday Agenda view shows todos"), | 942 | addWidBool(i18n("Allday Agenda view shows todos"), |
943 | &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); | 943 | &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); |
944 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 944 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
945 | 945 | ||
946 | 946 | ||
947 | topFrame = addPage(i18n("View Options"),0,0); | 947 | topFrame = addPage(i18n("View Options"),0,0); |
948 | 948 | ||
949 | topLayout = new QGridLayout(topFrame,4,1); | 949 | topLayout = new QGridLayout(topFrame,4,1); |
950 | topLayout->setSpacing(mSpacingHint); | 950 | topLayout->setSpacing(mSpacingHint); |
951 | topLayout->setMargin(mMarginHint); | 951 | topLayout->setMargin(mMarginHint); |
952 | ii = 0; | 952 | ii = 0; |
953 | 953 | ||
954 | dummy = | 954 | dummy = |
955 | addWidBool(i18n("Show Sync Events"), | 955 | addWidBool(i18n("Show Sync Events"), |
956 | &(KOPrefs::instance()->mShowSyncEvents),topFrame); | 956 | &(KOPrefs::instance()->mShowSyncEvents),topFrame); |
957 | topLayout->addWidget(dummy->checkBox(), ii++,0); | 957 | topLayout->addWidget(dummy->checkBox(), ii++,0); |
958 | 958 | ||
959 | lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); | 959 | lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); |
960 | topLayout->addWidget(lab ,ii++,0); | 960 | topLayout->addWidget(lab ,ii++,0); |
961 | 961 | ||
962 | dummy = addWidBool(i18n("Details"), | 962 | dummy = addWidBool(i18n("Details"), |
963 | &(KOPrefs::instance()->mEVshowDetails),topFrame); | 963 | &(KOPrefs::instance()->mEVshowDetails),topFrame); |
964 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 964 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
965 | dummy = addWidBool(i18n("Created time"), | 965 | dummy = addWidBool(i18n("Created time"), |
966 | &(KOPrefs::instance()->mEVshowCreated),topFrame); | 966 | &(KOPrefs::instance()->mEVshowCreated),topFrame); |
967 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 967 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
968 | dummy = addWidBool(i18n("Last modified time"), | 968 | dummy = addWidBool(i18n("Last modified time"), |
969 | &(KOPrefs::instance()->mEVshowChanged),topFrame); | 969 | &(KOPrefs::instance()->mEVshowChanged),topFrame); |
970 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 970 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
971 | 971 | ||
972 | 972 | ||
973 | lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame); | 973 | lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame); |
974 | topLayout->addWidget(lab ,ii++,0); | 974 | topLayout->addWidget(lab ,ii++,0); |
975 | 975 | ||
976 | dummy = addWidBool(i18n("Details"), | 976 | dummy = addWidBool(i18n("Details"), |
977 | &(KOPrefs::instance()->mWTshowDetails),topFrame); | 977 | &(KOPrefs::instance()->mWTshowDetails),topFrame); |
978 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 978 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
979 | dummy = addWidBool(i18n("Created time"), | 979 | dummy = addWidBool(i18n("Created time"), |
980 | &(KOPrefs::instance()->mWTshowCreated),topFrame); | 980 | &(KOPrefs::instance()->mWTshowCreated),topFrame); |
981 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 981 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
982 | dummy = addWidBool(i18n("Last modified time"), | 982 | dummy = addWidBool(i18n("Last modified time"), |
983 | &(KOPrefs::instance()->mWTshowChanged),topFrame); | 983 | &(KOPrefs::instance()->mWTshowChanged),topFrame); |
984 | topLayout->addWidget(dummy->checkBox(),ii++,0); | 984 | topLayout->addWidget(dummy->checkBox(),ii++,0); |
985 | 985 | ||
986 | 986 | ||
987 | topFrame = addPage(i18n("Alarm"),0,0); | 987 | topFrame = addPage(i18n("Alarm"),0,0); |
988 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 988 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
989 | 989 | ||
990 | topLayout = new QGridLayout(topFrame,2,1); | 990 | topLayout = new QGridLayout(topFrame,2,1); |
991 | topLayout->setSpacing(mSpacingHint); | 991 | topLayout->setSpacing(mSpacingHint); |
992 | topLayout->setMargin(mMarginHint); | 992 | topLayout->setMargin(mMarginHint); |
993 | int iii = 0; | 993 | int iii = 0; |
994 | 994 | ||
995 | dummy = | 995 | dummy = |
996 | addWidBool(i18n("Use internal alarm notification"), | 996 | addWidBool(i18n("Use internal alarm notification"), |
997 | &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame); | 997 | &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame); |
998 | topLayout->addWidget(dummy->checkBox(),iii++,0); | 998 | topLayout->addWidget(dummy->checkBox(),iii++,0); |
999 | 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); | 999 | 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); |
1000 | 1000 | ||
1001 | topLayout->addWidget(lab ,iii++,0); | 1001 | topLayout->addWidget(lab ,iii++,0); |
1002 | #ifndef DESKTOP_VERSION | 1002 | #ifndef DESKTOP_VERSION |
1003 | lab->setAlignment( AlignLeft|WordBreak|AlignTop); | 1003 | lab->setAlignment( AlignLeft|WordBreak|AlignTop); |
1004 | #else | 1004 | #else |
1005 | lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); | 1005 | lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); |
1006 | lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) ); | 1006 | lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) ); |
1007 | #endif | 1007 | #endif |
1008 | 1008 | ||
1009 | QHBox* dummyBox = new QHBox(topFrame); | 1009 | QHBox* dummyBox = new QHBox(topFrame); |
1010 | new QLabel(i18n("Play beeps count:"),dummyBox); | 1010 | new QLabel(i18n("Play beeps count:"),dummyBox); |
1011 | mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox); | 1011 | mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox); |
1012 | topLayout->addWidget(dummyBox,iii++,0); | 1012 | topLayout->addWidget(dummyBox,iii++,0); |
1013 | 1013 | ||
1014 | dummyBox = new QHBox(topFrame); | 1014 | dummyBox = new QHBox(topFrame); |
1015 | new QLabel(i18n("Beeps interval in sec:"),dummyBox); | 1015 | new QLabel(i18n("Beeps interval in sec:"),dummyBox); |
1016 | mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox); | 1016 | mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox); |
1017 | topLayout->addWidget(dummyBox,iii++,0); | 1017 | topLayout->addWidget(dummyBox,iii++,0); |
1018 | 1018 | ||
1019 | dummyBox = new QHBox(topFrame); | 1019 | dummyBox = new QHBox(topFrame); |
1020 | new QLabel(i18n("Default suspend time in min:"),dummyBox); | 1020 | new QLabel(i18n("Default suspend time in min:"),dummyBox); |
1021 | mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox); | 1021 | mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox); |
1022 | topLayout->addWidget(dummyBox,iii++,0); | 1022 | topLayout->addWidget(dummyBox,iii++,0); |
1023 | 1023 | ||
1024 | dummyBox = new QHBox(topFrame); | 1024 | dummyBox = new QHBox(topFrame); |
1025 | new QLabel(i18n("Auto suspend count:"),dummyBox); | 1025 | new QLabel(i18n("Auto suspend count:"),dummyBox); |
1026 | mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox); | 1026 | mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox); |
1027 | topLayout->addWidget(dummyBox,iii++,0); | 1027 | topLayout->addWidget(dummyBox,iii++,0); |
1028 | 1028 | ||
1029 | 1029 | ||
1030 | 1030 | ||
1031 | |||
1032 | |||
1033 | |||
1034 | |||
1035 | QHBox* hbo = new QHBox ( topFrame ); | 1031 | QHBox* hbo = new QHBox ( topFrame ); |
1036 | mDefaultAlarmFile = new QLineEdit(hbo); | 1032 | mDefaultAlarmFile = new QLineEdit(hbo); |
1037 | QPushButton * loadTemplate = new QPushButton(hbo); | 1033 | QPushButton * loadTemplate = new QPushButton(hbo); |
1038 | QPixmap icon; | 1034 | QPixmap icon; |
1039 | if ( QApplication::desktop()->width() < 321 ) | 1035 | if ( QApplication::desktop()->width() < 321 ) |
1040 | icon = SmallIcon("fileimport16"); | 1036 | icon = SmallIcon("fileimport16"); |
1041 | else | 1037 | else |
1042 | icon = SmallIcon("fileimport"); | 1038 | icon = SmallIcon("fileimport"); |
1043 | loadTemplate->setIconSet (icon ) ; | 1039 | loadTemplate->setIconSet (icon ) ; |
1044 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( selectSoundFile() ) ); | 1040 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( selectSoundFile() ) ); |
1045 | int size = loadTemplate->sizeHint().height(); | 1041 | int size = loadTemplate->sizeHint().height(); |
1046 | loadTemplate->setFixedSize( size, size ); | 1042 | loadTemplate->setFixedSize( size, size ); |
1047 | //lab = new QLabel( i18n("This setting is useless for 5500 user!"), topFrame); | 1043 | //lab = new QLabel( i18n("This setting is useless for 5500 user!"), topFrame); |
1048 | // topLayout->addWidget(lab ,iii++,0); | 1044 | // topLayout->addWidget(lab ,iii++,0); |
1049 | lab = new QLabel( i18n("Alarm *.wav file for newly created alarm:"), topFrame); | 1045 | lab = new QLabel( i18n("Alarm *.wav file for newly created alarm:"), topFrame); |
1050 | topLayout->addWidget(lab ,iii++,0); | 1046 | topLayout->addWidget(lab ,iii++,0); |
1051 | topLayout->addWidget(hbo,iii++,0); | 1047 | topLayout->addWidget(hbo,iii++,0); |
1052 | // 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); | 1048 | // 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); |
1053 | 1049 | ||
1054 | // topLayout->addWidget(lab ,iii++,0); | 1050 | // topLayout->addWidget(lab ,iii++,0); |
1055 | // #ifndef DESKTOP_VERSION | 1051 | // #ifndef DESKTOP_VERSION |
1056 | // lab->setAlignment( AlignLeft|WordBreak|AlignTop); | 1052 | // lab->setAlignment( AlignLeft|WordBreak|AlignTop); |
1057 | // #else | 1053 | // #else |
1058 | // lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); | 1054 | // lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); |
1059 | // lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) ); | 1055 | // lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) ); |
1060 | // #endif | 1056 | // #endif |
1061 | 1057 | ||
1062 | 1058 | ||
1063 | } | 1059 | } |
1064 | 1060 | ||
1065 | void KOPrefsDialog::selectSoundFile() | 1061 | void KOPrefsDialog::selectSoundFile() |
1066 | { | 1062 | { |
1067 | QString fileName = mDefaultAlarmFile->text(); | 1063 | QString fileName = mDefaultAlarmFile->text(); |
1068 | fileName = KFileDialog::getSaveFileName( mDefaultAlarmFile->text() , "Choose default alarm file", this ); | 1064 | fileName = KFileDialog::getSaveFileName( mDefaultAlarmFile->text() , "Choose default alarm file", this ); |
1069 | if ( fileName.length() > 0 ) | 1065 | if ( fileName.length() > 0 ) |
1070 | mDefaultAlarmFile->setText( fileName ); | 1066 | mDefaultAlarmFile->setText( fileName ); |
1071 | } | 1067 | } |
1072 | void KOPrefsDialog::setupFontsTab() | 1068 | void KOPrefsDialog::setupFontsTab() |
1073 | { | 1069 | { |
1074 | 1070 | ||
1075 | QFrame *topFrame = addPage(i18n("Fonts"),0,0); | 1071 | QFrame *topFrame = addPage(i18n("Fonts"),0,0); |
1076 | // DesktopIcon("fonts",KIcon::SizeMedium)); | 1072 | // DesktopIcon("fonts",KIcon::SizeMedium)); |
1077 | 1073 | ||
1078 | QGridLayout *topLayout = new QGridLayout(topFrame,7,3); | 1074 | QGridLayout *topLayout = new QGridLayout(topFrame,7,3); |
1079 | topLayout->setSpacing(1); | 1075 | topLayout->setSpacing(1); |
1080 | topLayout->setMargin(3); | 1076 | topLayout->setMargin(3); |
1081 | KPrefsDialogWidFont * tVFont; | 1077 | KPrefsDialogWidFont * tVFont; |
1082 | int i = 0; | 1078 | int i = 0; |
1083 | KPrefsDialogWidFont *timeLabelsFont = | 1079 | KPrefsDialogWidFont *timeLabelsFont = |
1084 | addWidFont(i18n("23"),i18n("DateNavigator:(nr)"), | 1080 | addWidFont(i18n("23"),i18n("DateNavigator:(nr)"), |
1085 | &(KOPrefs::instance()->mDateNavigatorFont),topFrame); | 1081 | &(KOPrefs::instance()->mDateNavigatorFont),topFrame); |
1086 | topLayout->addWidget(timeLabelsFont->label(),i,0); | 1082 | topLayout->addWidget(timeLabelsFont->label(),i,0); |
1087 | topLayout->addWidget(timeLabelsFont->preview(),i,1); | 1083 | topLayout->addWidget(timeLabelsFont->preview(),i,1); |
1088 | topLayout->addWidget(timeLabelsFont->button(),i,2); | 1084 | topLayout->addWidget(timeLabelsFont->button(),i,2); |
1089 | ++i; | 1085 | ++i; |
1090 | 1086 | ||
1091 | 1087 | ||
1092 | timeLabelsFont = | 1088 | timeLabelsFont = |
1093 | addWidFont(i18n("Mon 15"),i18n("Date Labels:"), | 1089 | addWidFont(i18n("Mon 15"),i18n("Date Labels:"), |
1094 | &(KOPrefs::instance()->mTimeLabelsFont),topFrame); | 1090 | &(KOPrefs::instance()->mTimeLabelsFont),topFrame); |
1095 | topLayout->addWidget(timeLabelsFont->label(),i,0); | 1091 | topLayout->addWidget(timeLabelsFont->label(),i,0); |
1096 | topLayout->addWidget(timeLabelsFont->preview(),i,1); | 1092 | topLayout->addWidget(timeLabelsFont->preview(),i,1); |
1097 | topLayout->addWidget(timeLabelsFont->button(),i,2); | 1093 | topLayout->addWidget(timeLabelsFont->button(),i,2); |
1098 | ++i; | 1094 | ++i; |
1099 | 1095 | ||
1100 | KPrefsDialogWidFont *timeBarFont = | 1096 | KPrefsDialogWidFont *timeBarFont = |
1101 | addWidFont(KGlobal::locale()->formatTime(QTime(12,34)),i18n("Time bar:"), | 1097 | addWidFont(KGlobal::locale()->formatTime(QTime(12,34)),i18n("Time bar:"), |
1102 | &(KOPrefs::instance()->mTimeBarFont),topFrame); | 1098 | &(KOPrefs::instance()->mTimeBarFont),topFrame); |
1103 | topLayout->addWidget(timeBarFont->label(),i,0); | 1099 | topLayout->addWidget(timeBarFont->label(),i,0); |
1104 | topLayout->addWidget(timeBarFont->preview(),i,1); | 1100 | topLayout->addWidget(timeBarFont->preview(),i,1); |
1105 | topLayout->addWidget(timeBarFont->button(),i,2); | 1101 | topLayout->addWidget(timeBarFont->button(),i,2); |
1106 | ++i; | 1102 | ++i; |
1107 | 1103 | ||
1108 | 1104 | ||
1109 | KPrefsDialogWidFont *marcusBainsFont = | 1105 | KPrefsDialogWidFont *marcusBainsFont = |
1110 | addWidFont(KGlobal::locale()->formatTime(QTime(12,34,23)),i18n("M. Bains line:"), | 1106 | addWidFont(KGlobal::locale()->formatTime(QTime(12,34,23)),i18n("M. Bains line:"), |
1111 | &(KOPrefs::instance()->mMarcusBainsFont),topFrame); | 1107 | &(KOPrefs::instance()->mMarcusBainsFont),topFrame); |
1112 | topLayout->addWidget(marcusBainsFont->label(),i,0); | 1108 | topLayout->addWidget(marcusBainsFont->label(),i,0); |
1113 | topLayout->addWidget(marcusBainsFont->preview(),i,1); | 1109 | topLayout->addWidget(marcusBainsFont->preview(),i,1); |
1114 | topLayout->addWidget(marcusBainsFont->button(),i,2); | 1110 | topLayout->addWidget(marcusBainsFont->button(),i,2); |
1115 | ++i; | 1111 | ++i; |
1116 | 1112 | ||
1117 | tVFont = | 1113 | tVFont = |
1118 | addWidFont(i18n("Summary"),i18n("Event Viewer:"), | 1114 | addWidFont(i18n("Summary"),i18n("Event Viewer:"), |
1119 | &(KOPrefs::instance()->mEventViewFont),topFrame); | 1115 | &(KOPrefs::instance()->mEventViewFont),topFrame); |
1120 | topLayout->addWidget(tVFont->label(),i,0); | 1116 | topLayout->addWidget(tVFont->label(),i,0); |
1121 | topLayout->addWidget(tVFont->preview(),i,1); | 1117 | topLayout->addWidget(tVFont->preview(),i,1); |
1122 | topLayout->addWidget(tVFont->button(),i,2); | 1118 | topLayout->addWidget(tVFont->button(),i,2); |
1123 | ++i; | 1119 | ++i; |
1124 | 1120 | ||
1125 | 1121 | ||
1126 | 1122 | ||
1127 | tVFont = | 1123 | tVFont = |
1128 | addWidFont(i18n("Details"),i18n("EditorBox:"), | 1124 | addWidFont(i18n("Details"),i18n("EditorBox:"), |
1129 | &(KOPrefs::instance()->mEditBoxFont),topFrame); | 1125 | &(KOPrefs::instance()->mEditBoxFont),topFrame); |
1130 | topLayout->addWidget(tVFont->label(),i,0); | 1126 | topLayout->addWidget(tVFont->label(),i,0); |
1131 | topLayout->addWidget(tVFont->preview(),i,1); | 1127 | topLayout->addWidget(tVFont->preview(),i,1); |
1132 | topLayout->addWidget(tVFont->button(),i,2); | 1128 | topLayout->addWidget(tVFont->button(),i,2); |
1133 | ++i; | 1129 | ++i; |
1134 | 1130 | ||
1135 | 1131 | ||
1136 | 1132 | ||
1137 | topLayout->setColStretch(1,1); | 1133 | topLayout->setColStretch(1,1); |
1138 | topLayout->setRowStretch(4,1); | 1134 | topLayout->setRowStretch(4,1); |
1139 | 1135 | ||
1140 | 1136 | ||
1141 | i = 0; | 1137 | i = 0; |
1142 | topFrame = addPage(i18n("View Fonts"),0, | 1138 | topFrame = addPage(i18n("View Fonts"),0, |
1143 | DesktopIcon("fonts",KIcon::SizeMedium)); | 1139 | DesktopIcon("fonts",KIcon::SizeMedium)); |
1144 | 1140 | ||
1145 | topLayout = new QGridLayout(topFrame,7,3); | 1141 | topLayout = new QGridLayout(topFrame,7,3); |
1146 | topLayout->setSpacing(1); | 1142 | topLayout->setSpacing(1); |
1147 | topLayout->setMargin(3); | 1143 | topLayout->setMargin(3); |
1148 | 1144 | ||
1149 | tVFont = | 1145 | tVFont = |
1150 | addWidFont(i18n("Configure KO"),i18n("What's Next View:"), | 1146 | addWidFont(i18n("Configure KO"),i18n("What's Next View:"), |
1151 | &(KOPrefs::instance()->mWhatsNextFont),topFrame); | 1147 | &(KOPrefs::instance()->mWhatsNextFont),topFrame); |
1152 | topLayout->addWidget(tVFont->label(),i,0); | 1148 | topLayout->addWidget(tVFont->label(),i,0); |
1153 | topLayout->addWidget(tVFont->preview(),i,1); | 1149 | topLayout->addWidget(tVFont->preview(),i,1); |
1154 | topLayout->addWidget(tVFont->button(),i,2); | 1150 | topLayout->addWidget(tVFont->button(),i,2); |
1155 | ++i; | 1151 | ++i; |
1156 | KPrefsDialogWidFont *agendaViewFont = | 1152 | KPrefsDialogWidFont *agendaViewFont = |
1157 | addWidFont(i18n("Event text"),i18n("Agenda view:"), | 1153 | addWidFont(i18n("Event text"),i18n("Agenda view:"), |
1158 | &(KOPrefs::instance()->mAgendaViewFont),topFrame); | 1154 | &(KOPrefs::instance()->mAgendaViewFont),topFrame); |
1159 | topLayout->addWidget(agendaViewFont->label(),i,0); | 1155 | topLayout->addWidget(agendaViewFont->label(),i,0); |
1160 | topLayout->addWidget(agendaViewFont->preview(),i,1); | 1156 | topLayout->addWidget(agendaViewFont->preview(),i,1); |
1161 | topLayout->addWidget(agendaViewFont->button(),i,2); | 1157 | topLayout->addWidget(agendaViewFont->button(),i,2); |
1162 | ++i; | 1158 | ++i; |
1163 | 1159 | ||
1164 | 1160 | ||
1165 | KPrefsDialogWidFont *monthViewFont = | 1161 | KPrefsDialogWidFont *monthViewFont = |
1166 | addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"), | 1162 | addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"), |
1167 | i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame); | 1163 | i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame); |
1168 | topLayout->addWidget(monthViewFont->label(),i,0); | 1164 | topLayout->addWidget(monthViewFont->label(),i,0); |
1169 | topLayout->addWidget(monthViewFont->preview(),i,1); | 1165 | topLayout->addWidget(monthViewFont->preview(),i,1); |
1170 | topLayout->addWidget(monthViewFont->button(),i,2); | 1166 | topLayout->addWidget(monthViewFont->button(),i,2); |
1171 | ++i; | 1167 | ++i; |
1172 | 1168 | ||
1173 | 1169 | ||
1174 | KPrefsDialogWidFont *lVFont = | 1170 | KPrefsDialogWidFont *lVFont = |
1175 | addWidFont(i18n("Event"),i18n("List View:"), | 1171 | addWidFont(i18n("Event"),i18n("List View:"), |
1176 | &(KOPrefs::instance()->mListViewFont),topFrame); | 1172 | &(KOPrefs::instance()->mListViewFont),topFrame); |
1177 | topLayout->addWidget(lVFont->label(),i,0); | 1173 | topLayout->addWidget(lVFont->label(),i,0); |
1178 | topLayout->addWidget(lVFont->preview(),i,1); | 1174 | topLayout->addWidget(lVFont->preview(),i,1); |
1179 | topLayout->addWidget(lVFont->button(),i,2); | 1175 | topLayout->addWidget(lVFont->button(),i,2); |
1180 | ++i; | 1176 | ++i; |
1181 | 1177 | ||
1182 | 1178 | ||
1183 | tVFont = | 1179 | tVFont = |
1184 | addWidFont(i18n("ToDo"),i18n("ToDoView:"), | 1180 | addWidFont(i18n("ToDo"),i18n("ToDoView:"), |
1185 | &(KOPrefs::instance()->mTodoViewFont),topFrame); | 1181 | &(KOPrefs::instance()->mTodoViewFont),topFrame); |
1186 | topLayout->addWidget(tVFont->label(),i,0); | 1182 | topLayout->addWidget(tVFont->label(),i,0); |
1187 | topLayout->addWidget(tVFont->preview(),i,1); | 1183 | topLayout->addWidget(tVFont->preview(),i,1); |
1188 | topLayout->addWidget(tVFont->button(),i,2); | 1184 | topLayout->addWidget(tVFont->button(),i,2); |
1189 | ++i; | 1185 | ++i; |
1190 | 1186 | ||
1191 | 1187 | ||
1192 | tVFont = | 1188 | tVFont = |
1193 | addWidFont(i18n("Today"),i18n("JournalView:"), | 1189 | addWidFont(i18n("Today"),i18n("JournalView:"), |
1194 | &(KOPrefs::instance()->mJornalViewFont),topFrame); | 1190 | &(KOPrefs::instance()->mJornalViewFont),topFrame); |
1195 | topLayout->addWidget(tVFont->label(),i,0); | 1191 | topLayout->addWidget(tVFont->label(),i,0); |
1196 | topLayout->addWidget(tVFont->preview(),i,1); | 1192 | topLayout->addWidget(tVFont->preview(),i,1); |
1197 | topLayout->addWidget(tVFont->button(),i,2); | 1193 | topLayout->addWidget(tVFont->button(),i,2); |
1198 | ++i; | 1194 | ++i; |
1199 | 1195 | ||
1200 | 1196 | ||
1201 | 1197 | ||
1202 | 1198 | ||
1203 | topLayout->setColStretch(1,1); | 1199 | topLayout->setColStretch(1,1); |
1204 | topLayout->setRowStretch(4,1); | 1200 | topLayout->setRowStretch(4,1); |
1205 | 1201 | ||
1206 | 1202 | ||
1207 | 1203 | ||
1208 | 1204 | ||
1209 | } | 1205 | } |
1210 | 1206 | ||
1211 | void KOPrefsDialog::setupColorsTab() | 1207 | void KOPrefsDialog::setupColorsTab() |
1212 | { | 1208 | { |
1213 | QFrame *topFrame = addPage(i18n("Colors"),0,0); | 1209 | QFrame *topFrame = addPage(i18n("Colors"),0,0); |
1214 | // DesktopIcon("colorize",KIcon::SizeMedium)); | 1210 | // DesktopIcon("colorize",KIcon::SizeMedium)); |
1215 | 1211 | ||
1216 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); | 1212 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); |
1217 | // topLayout->setSpacing(mSpacingHint); | 1213 | // topLayout->setSpacing(mSpacingHint); |
1218 | // topLayout->setMargin(mMarginHint); | 1214 | // topLayout->setMargin(mMarginHint); |
1219 | 1215 | ||
1220 | topLayout->setSpacing(2); | 1216 | topLayout->setSpacing(2); |
1221 | topLayout->setMargin(3); | 1217 | topLayout->setMargin(3); |
1222 | 1218 | ||
1223 | int ii = 1; | 1219 | int ii = 1; |
1224 | QGroupBox *categoryGroup ; | 1220 | QGroupBox *categoryGroup ; |
1225 | 1221 | ||
1226 | categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"), | 1222 | categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"), |
1227 | topFrame); | 1223 | topFrame); |
1228 | topLayout->addMultiCellWidget(categoryGroup,0,0,0,1); | 1224 | topLayout->addMultiCellWidget(categoryGroup,0,0,0,1); |
1229 | 1225 | ||
1230 | mCategoryCombo = new QComboBox(categoryGroup); | 1226 | mCategoryCombo = new QComboBox(categoryGroup); |
1231 | mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); | 1227 | mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories); |
1232 | connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor())); | 1228 | connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor())); |
1233 | 1229 | ||
1234 | mCategoryButton = new KColorButton(categoryGroup); | 1230 | mCategoryButton = new KColorButton(categoryGroup); |
1235 | connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor())); | 1231 | connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor())); |
1236 | updateCategoryColor(); | 1232 | updateCategoryColor(); |
1237 | 1233 | ||
1238 | 1234 | ||
1239 | // Holiday Color | 1235 | // Holiday Color |
1240 | 1236 | ||
1241 | KPrefsDialogWidColor *holidayColor = | 1237 | KPrefsDialogWidColor *holidayColor = |
1242 | addWidColor(i18n("Holiday color:"), | 1238 | addWidColor(i18n("Holiday color:"), |
1243 | &(KOPrefs::instance()->mHolidayColor),topFrame); | 1239 | &(KOPrefs::instance()->mHolidayColor),topFrame); |
1244 | topLayout->addWidget(holidayColor->label(),ii,0); | 1240 | topLayout->addWidget(holidayColor->label(),ii,0); |
1245 | topLayout->addWidget(holidayColor->button(),ii++,1); | 1241 | topLayout->addWidget(holidayColor->button(),ii++,1); |
1246 | 1242 | ||
1247 | // Highlight Color | 1243 | // Highlight Color |
1248 | KPrefsDialogWidColor *highlightColor = | 1244 | KPrefsDialogWidColor *highlightColor = |
1249 | addWidColor(i18n("Highlight color:"), | 1245 | addWidColor(i18n("Highlight color:"), |
1250 | &(KOPrefs::instance()->mHighlightColor),topFrame); | 1246 | &(KOPrefs::instance()->mHighlightColor),topFrame); |
1251 | topLayout->addWidget(highlightColor->label(),ii,0); | 1247 | topLayout->addWidget(highlightColor->label(),ii,0); |
1252 | topLayout->addWidget(highlightColor->button(),ii++,1); | 1248 | topLayout->addWidget(highlightColor->button(),ii++,1); |
1253 | 1249 | ||
1254 | // Event color | 1250 | // Event color |
1255 | KPrefsDialogWidColor *eventColor = | 1251 | KPrefsDialogWidColor *eventColor = |
1256 | addWidColor(i18n("Default event color:"), | 1252 | addWidColor(i18n("Default event color:"), |
1257 | &(KOPrefs::instance()->mEventColor),topFrame); | 1253 | &(KOPrefs::instance()->mEventColor),topFrame); |
1258 | topLayout->addWidget(eventColor->label(),ii,0); | 1254 | topLayout->addWidget(eventColor->label(),ii,0); |
1259 | topLayout->addWidget(eventColor->button(),ii++,1); | 1255 | topLayout->addWidget(eventColor->button(),ii++,1); |
1260 | eventColor = | 1256 | eventColor = |
1261 | addWidColor(i18n("Default todo done color:"), | 1257 | addWidColor(i18n("Default todo done color:"), |
1262 | &(KOPrefs::instance()->mTodoDoneColor),topFrame); | 1258 | &(KOPrefs::instance()->mTodoDoneColor),topFrame); |
1263 | topLayout->addWidget(eventColor->label(),ii,0); | 1259 | topLayout->addWidget(eventColor->label(),ii,0); |
1264 | topLayout->addWidget(eventColor->button(),ii++,1); | 1260 | topLayout->addWidget(eventColor->button(),ii++,1); |
1265 | 1261 | ||
1266 | 1262 | ||
1267 | // agenda view background color | 1263 | // agenda view background color |
1268 | KPrefsDialogWidColor *agendaBgColor = | 1264 | KPrefsDialogWidColor *agendaBgColor = |
1269 | addWidColor(i18n("Agenda view background color:"), | 1265 | addWidColor(i18n("Agenda view background color:"), |
1270 | &(KOPrefs::instance()->mAgendaBgColor),topFrame); | 1266 | &(KOPrefs::instance()->mAgendaBgColor),topFrame); |
1271 | topLayout->addWidget(agendaBgColor->label(),ii,0); | 1267 | topLayout->addWidget(agendaBgColor->label(),ii,0); |
1272 | topLayout->addWidget(agendaBgColor->button(),ii++,1); | 1268 | topLayout->addWidget(agendaBgColor->button(),ii++,1); |
1273 | 1269 | ||
1274 | // working hours color | 1270 | // working hours color |
1275 | KPrefsDialogWidColor *workingHoursColor = | 1271 | KPrefsDialogWidColor *workingHoursColor = |
1276 | addWidColor(i18n("Working hours color:"), | 1272 | addWidColor(i18n("Working hours color:"), |
1277 | &(KOPrefs::instance()->mWorkingHoursColor),topFrame); | 1273 | &(KOPrefs::instance()->mWorkingHoursColor),topFrame); |
1278 | topLayout->addWidget(workingHoursColor->label(),ii,0); | 1274 | topLayout->addWidget(workingHoursColor->label(),ii,0); |
1279 | topLayout->addWidget(workingHoursColor->button(),ii++,1); | 1275 | topLayout->addWidget(workingHoursColor->button(),ii++,1); |
1280 | 1276 | ||
1281 | KPrefsDialogWidBool *sb = | 1277 | KPrefsDialogWidBool *sb = |
1282 | addWidBool(i18n("Use colors for application:"), | 1278 | addWidBool(i18n("Use colors for application:"), |
1283 | &(KOPrefs::instance()->mUseAppColors),topFrame); | 1279 | &(KOPrefs::instance()->mUseAppColors),topFrame); |
1284 | topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 ); | 1280 | topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 ); |
1285 | 1281 | ||
1286 | ii++; | 1282 | ii++; |
1287 | KPrefsDialogWidColor * workingHoursColor1 = | 1283 | KPrefsDialogWidColor * workingHoursColor1 = |
1288 | addWidColor(i18n("Buttons, menus, etc.:"), | 1284 | addWidColor(i18n("Buttons, menus, etc.:"), |
1289 | &(KOPrefs::instance()->mAppColor1),topFrame); | 1285 | &(KOPrefs::instance()->mAppColor1),topFrame); |
1290 | topLayout->addWidget(workingHoursColor1->label(),ii,0); | 1286 | topLayout->addWidget(workingHoursColor1->label(),ii,0); |