summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebook.cpp14
-rw-r--r--core/pim/datebook/datebook.h2
-rw-r--r--core/pim/datebook/datebook.pro3
-rw-r--r--core/pim/datebook/datebookday.cpp65
-rw-r--r--core/pim/datebook/datebookday.h6
-rw-r--r--core/pim/datebook/datebooksettings.cpp20
-rw-r--r--core/pim/datebook/datebooksettings.h7
-rw-r--r--core/pim/datebook/datebooksettingsbase.ui371
-rw-r--r--core/pim/datebook/datebookweeklst.cpp64
9 files changed, 406 insertions, 146 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index c0d45c9..7dd93a6 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -82,2 +82,4 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
82 startTime( 8 ), // an acceptable default 82 startTime( 8 ), // an acceptable default
83 rowStyle( 0 ),
84 bJumpToCurTime(FALSE),
83 syncing(FALSE), 85 syncing(FALSE),
@@ -251,2 +253,4 @@ void DateBook::slotSettings()
251 frmSettings.setAlarmPreset( aPreset, presetTime ); 253 frmSettings.setAlarmPreset( aPreset, presetTime );
254 frmSettings.setJumpToCurTime( bJumpToCurTime );
255 frmSettings.setRowStyle( rowStyle );
252#if defined (Q_WS_QWS) || defined(_WS_QWS_) 256#if defined (Q_WS_QWS) || defined(_WS_QWS_)
@@ -259,4 +263,8 @@ void DateBook::slotSettings()
259 startTime = frmSettings.startTime(); 263 startTime = frmSettings.startTime();
264 bJumpToCurTime = frmSettings.jumpToCurTime();
265 rowStyle = frmSettings.rowStyle();
260 if ( dayView ) 266 if ( dayView )
261 dayView->setStartViewTime( startTime ); 267 dayView->setStartViewTime( startTime );
268 dayView->setJumpToCurTime( bJumpToCurTime );
269 dayView->setRowStyle( rowStyle );
262 if ( weekView ) 270 if ( weekView )
@@ -455,2 +463,4 @@ void DateBook::initDay()
455 dayView->setStartViewTime( startTime ); 463 dayView->setStartViewTime( startTime );
464 dayView->setJumpToCurTime( bJumpToCurTime );
465 dayView->setRowStyle( rowStyle );
456 connect( this, SIGNAL( newEvent() ), 466 connect( this, SIGNAL( newEvent() ),
@@ -549,2 +559,4 @@ void DateBook::loadSettings()
549 presetTime = config.readNumEntry("presettime"); 559 presetTime = config.readNumEntry("presettime");
560 bJumpToCurTime = config.readBoolEntry("jumptocurtime");
561 rowStyle = config.readNumEntry("rowstyle");
550 } 562 }
@@ -560,2 +572,4 @@ void DateBook::saveSettings()
560 configDB.writeEntry("presettime",presetTime); 572 configDB.writeEntry("presettime",presetTime);
573 configDB.writeEntry("jumptocurtime", bJumpToCurTime);
574 configDB.writeEntry("rowstyle", rowStyle);
561} 575}
diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h
index e7be0dd..ba8f97e 100644
--- a/core/pim/datebook/datebook.h
+++ b/core/pim/datebook/datebook.h
@@ -116,2 +116,4 @@ private:
116 int startTime; 116 int startTime;
117 int rowStyle;
118 bool bJumpToCurTime; //should jump to current time in dayview?
117 bool ampm; 119 bool ampm;
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 609b7dc..1db3e3a 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -9,2 +9,3 @@ HEADERS = datebookday.h \
9 datebooksettings.h \ 9 datebooksettings.h \
10 datebooksettingsbase.h \
10 datebookweek.h \ 11 datebookweek.h \
@@ -22,2 +23,3 @@ SOURCES = main.cpp \
22 datebookdayheaderimpl.cpp \ 23 datebookdayheaderimpl.cpp \
24 datebooksettingsbase.cpp \
23 datebooksettings.cpp \ 25 datebooksettings.cpp \
@@ -33,3 +35,2 @@ INTERFACES = dateentry.ui \
33 datebookdayheader.ui \ 35 datebookdayheader.ui \
34 datebooksettingsbase.ui \
35 datebookweekheader.ui \ 36 datebookweekheader.ui \
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index c15ccef..9cc5fcd 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -62,3 +62,3 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent,
62 setItem( row, 0, tmp ); 62 setItem( row, 0, tmp );
63 setRowHeight( row, 40); 63 //setRowHeight( row, 40);
64 } 64 }
@@ -161,2 +161,9 @@ void DateBookDayView::keyPressEvent( QKeyEvent *e )
161 161
162void DateBookDayView::setRowStyle( int style )
163{
164 if (style<0) style = 0;
165
166 for (int i=0; i<numRows(); i++)
167 setRowHeight(i, style*10+20);
168}
162 169
@@ -176,2 +183,3 @@ DateBookDay::DateBookDay( bool ampm, bool startOnMonday,
176 view = new DateBookDayView( ampm, this, "day view" ); 183 view = new DateBookDayView( ampm, this, "day view" );
184
177 connect( header, SIGNAL( dateChanged( int, int, int ) ), 185 connect( header, SIGNAL( dateChanged( int, int, int ) ),
@@ -195,2 +203,14 @@ DateBookDay::DateBookDay( bool ampm, bool startOnMonday,
195 timeMarker->setTime( QTime::currentTime() ); 203 timeMarker->setTime( QTime::currentTime() );
204 rowStyle = -1; // initialize with bogus values
205}
206
207void DateBookDay::setJumpToCurTime( bool bJump )
208{
209 jumpToCurTime = bJump;
210}
211
212void DateBookDay::setRowStyle( int style )
213{
214 if (rowStyle != style) view->setRowStyle( style );
215 rowStyle = style;
196} 216}
@@ -259,4 +279,13 @@ void DateBookDay::dateChanged( int y, int m, int d )
259 QTableSelection ts; 279 QTableSelection ts;
260 ts.init( startTime, 0 ); 280
261 ts.expandTo( startTime, 0 ); 281 if (jumpToCurTime && this->date() == QDate::currentDate())
282 {
283 ts.init( QTime::currentTime().hour(), 0);
284 ts.expandTo( QTime::currentTime().hour(), 0);
285 } else
286 {
287 ts.init( startTime, 0 );
288 ts.expandTo( startTime, 0 );
289 }
290
262 dayView()->addSelection( ts ); 291 dayView()->addSelection( ts );
@@ -265,5 +294,2 @@ void DateBookDay::dateChanged( int y, int m, int d )
265 294
266 if (this->date() == QDate::currentDate())
267 timeMarker->show(); else timeMarker->hide();
268
269} 295}
@@ -401,3 +427,6 @@ void DateBookDay::relayoutPage( bool fromResize )
401 427
402 view->setContentsPos( 0, startTime * view->rowHeight(0) ); 428 if (jumpToCurTime && this->date() == QDate::currentDate())
429 view->setContentsPos( 0, QTime::currentTime().hour() * view->rowHeight(0) ); //set listview to current hour
430 else
431 view->setContentsPos( 0, startTime * view->rowHeight(0) );
403 432
@@ -446,3 +475,7 @@ void DateBookDay::relayoutPage( bool fromResize )
446 } 475 }
447 view->setContentsPos( 0, startTime * view->rowHeight(0) ); 476
477 if (jumpToCurTime && this->date() == QDate::currentDate())
478 view->setContentsPos( 0, QTime::currentTime().hour() * view->rowHeight(0) ); //set listview to current hour
479 else
480 view->setContentsPos( 0, startTime * view->rowHeight(0) );
448 } 481 }
@@ -451,2 +484,5 @@ void DateBookDay::relayoutPage( bool fromResize )
451 timeMarker->raise(); //on top of all widgets 484 timeMarker->raise(); //on top of all widgets
485 if (this->date() == QDate::currentDate()) //only show timeMarker on current day
486 timeMarker->show(); else timeMarker->hide();
487
452 setUpdatesEnabled( TRUE ); 488 setUpdatesEnabled( TRUE );
@@ -481,4 +517,13 @@ void DateBookDay::setStartViewTime( int startHere )
481 QTableSelection ts; 517 QTableSelection ts;
482 ts.init( startTime, 0 ); 518
483 ts.expandTo( startTime, 0 ); 519 if (jumpToCurTime && this->date() == QDate::currentDate())//this should probably be in datebook.cpp where it's called?
520 {
521 ts.init( QTime::currentTime().hour(), 0);
522 ts.expandTo( QTime::currentTime().hour(), 0);
523 } else
524 {
525 ts.init( startTime, 0 );
526 ts.expandTo( startTime, 0 );
527 }
528
484 dayView()->addSelection( ts ); 529 dayView()->addSelection( ts );
diff --git a/core/pim/datebook/datebookday.h b/core/pim/datebook/datebookday.h
index db0f3b6..be7cc45 100644
--- a/core/pim/datebook/datebookday.h
+++ b/core/pim/datebook/datebookday.h
@@ -42,2 +42,4 @@ public:
42 bool whichClock() const; 42 bool whichClock() const;
43
44 void setRowStyle( int style );
43 45
@@ -151,2 +153,4 @@ public:
151 DateBookDayWidget * getSelectedWidget( void ); 153 DateBookDayWidget * getSelectedWidget( void );
154 void setJumpToCurTime( bool bJump );
155 void setRowStyle( int style );
152 156
@@ -183,2 +187,4 @@ private:
183 int startTime; 187 int startTime;
188 bool jumpToCurTime;//should we jump to current time in dayview?
189 int rowStyle;
184 DateBookDayWidget *selectedWidget; //actual selected widget (obviously) 190 DateBookDayWidget *selectedWidget; //actual selected widget (obviously)
diff --git a/core/pim/datebook/datebooksettings.cpp b/core/pim/datebook/datebooksettings.cpp
index c5d8ac1..49fcd17 100644
--- a/core/pim/datebook/datebooksettings.cpp
+++ b/core/pim/datebook/datebooksettings.cpp
@@ -135 +135,21 @@ void DateBookSettings::slotChangeClock( bool whichClock )
135} 135}
136
137void DateBookSettings::setJumpToCurTime( bool bJump )
138{
139 chkJumpToCurTime->setChecked( bJump );
140}
141
142bool DateBookSettings::jumpToCurTime() const
143{
144 return chkJumpToCurTime->isChecked();
145}
146
147void DateBookSettings::setRowStyle( int style )
148{
149 comboRowStyle->setCurrentItem( style );
150}
151
152int DateBookSettings::rowStyle() const
153{
154 return comboRowStyle->currentItem();
155}
diff --git a/core/pim/datebook/datebooksettings.h b/core/pim/datebook/datebooksettings.h
index ee9f39c..90a07f9 100644
--- a/core/pim/datebook/datebooksettings.h
+++ b/core/pim/datebook/datebooksettings.h
@@ -37,3 +37,8 @@ public:
37 int alarmType() const; 37 int alarmType() const;
38 38
39 void setJumpToCurTime( bool bJump );
40 bool jumpToCurTime() const;
41 void setRowStyle( int style );
42 int rowStyle() const;
43
39private slots: 44private slots:
diff --git a/core/pim/datebook/datebooksettingsbase.ui b/core/pim/datebook/datebooksettingsbase.ui
index 0f40773..816a441 100644
--- a/core/pim/datebook/datebooksettingsbase.ui
+++ b/core/pim/datebook/datebooksettingsbase.ui
@@ -34,3 +34,3 @@
34 <y>0</y> 34 <y>0</y>
35 <width>232</width> 35 <width>220</width>
36 <height>290</height> 36 <height>290</height>
@@ -48,6 +48,6 @@
48 </property> 48 </property>
49 <vbox> 49 <grid>
50 <property stdset="1"> 50 <property stdset="1">
51 <name>margin</name> 51 <name>margin</name>
52 <number>5</number> 52 <number>11</number>
53 </property> 53 </property>
@@ -55,5 +55,5 @@
55 <name>spacing</name> 55 <name>spacing</name>
56 <number>1</number> 56 <number>6</number>
57 </property> 57 </property>
58 <widget> 58 <widget row="0" column="0" >
59 <class>QGroupBox</class> 59 <class>QGroupBox</class>
@@ -75,61 +75,98 @@
75 </property> 75 </property>
76 <vbox> 76 <widget>
77 <class>QLayoutWidget</class>
77 <property stdset="1"> 78 <property stdset="1">
78 <name>margin</name> 79 <name>name</name>
79 <number>11</number> 80 <cstring>Layout6</cstring>
80 </property> 81 </property>
81 <property stdset="1"> 82 <property stdset="1">
82 <name>spacing</name> 83 <name>geometry</name>
83 <number>6</number> 84 <rect>
85 <x>3</x>
86 <y>21</y>
87 <width>210</width>
88 <height>53</height>
89 </rect>
84 </property> 90 </property>
85 <widget> 91 <grid>
86 <class>QLayoutWidget</class>
87 <property stdset="1"> 92 <property stdset="1">
88 <name>name</name> 93 <name>margin</name>
89 <cstring>Layout1</cstring> 94 <number>0</number>
90 </property> 95 </property>
91 <hbox> 96 <property stdset="1">
97 <name>spacing</name>
98 <number>6</number>
99 </property>
100 <spacer row="1" column="0" >
101 <property>
102 <name>name</name>
103 <cstring>Spacer1</cstring>
104 </property>
92 <property stdset="1"> 105 <property stdset="1">
93 <name>margin</name> 106 <name>orientation</name>
94 <number>0</number> 107 <enum>Vertical</enum>
95 </property> 108 </property>
96 <property stdset="1"> 109 <property stdset="1">
97 <name>spacing</name> 110 <name>sizeType</name>
98 <number>6</number> 111 <enum>Expanding</enum>
99 </property> 112 </property>
100 <widget> 113 <property>
101 <class>QLabel</class> 114 <name>sizeHint</name>
102 <property stdset="1"> 115 <size>
103 <name>name</name> 116 <width>20</width>
104 <cstring>lblStartTime</cstring> 117 <height>20</height>
105 </property> 118 </size>
106 <property stdset="1"> 119 </property>
107 <name>text</name> 120 </spacer>
108 <string>Start Time:</string> 121 <widget row="0" column="0" >
109 </property> 122 <class>QLayoutWidget</class>
110 </widget> 123 <property stdset="1">
111 <widget> 124 <name>name</name>
112 <class>QSpinBox</class> 125 <cstring>Layout1</cstring>
113 <property stdset="1"> 126 </property>
114 <name>name</name> 127 <hbox>
115 <cstring>spinStart</cstring>
116 </property>
117 <property stdset="1">
118 <name>suffix</name>
119 <string>:00</string>
120 </property>
121 <property stdset="1"> 128 <property stdset="1">
122 <name>wrapping</name> 129 <name>margin</name>
123 <bool>true</bool> 130 <number>0</number>
124 </property> 131 </property>
125 <property stdset="1"> 132 <property stdset="1">
126 <name>maxValue</name> 133 <name>spacing</name>
127 <number>23</number> 134 <number>6</number>
128 </property> 135 </property>
129 </widget> 136 <widget>
130 </hbox> 137 <class>QLabel</class>
131 </widget> 138 <property stdset="1">
132 </vbox> 139 <name>name</name>
140 <cstring>lblStartTime</cstring>
141 </property>
142 <property stdset="1">
143 <name>text</name>
144 <string>Start Time:</string>
145 </property>
146 </widget>
147 <widget>
148 <class>QSpinBox</class>
149 <property stdset="1">
150 <name>name</name>
151 <cstring>spinStart</cstring>
152 </property>
153 <property stdset="1">
154 <name>suffix</name>
155 <string>:00</string>
156 </property>
157 <property stdset="1">
158 <name>wrapping</name>
159 <bool>true</bool>
160 </property>
161 <property stdset="1">
162 <name>maxValue</name>
163 <number>23</number>
164 </property>
165 </widget>
166 </hbox>
167 </widget>
168 </grid>
169 </widget>
133 </widget> 170 </widget>
134 <widget> 171 <widget row="1" column="0" >
135 <class>QGroupBox</class> 172 <class>QGroupBox</class>
@@ -143,73 +180,203 @@
143 </property> 180 </property>
144 <vbox> 181 <widget>
182 <class>QLayoutWidget</class>
145 <property stdset="1"> 183 <property stdset="1">
146 <name>margin</name> 184 <name>name</name>
147 <number>11</number> 185 <cstring>Layout4</cstring>
148 </property> 186 </property>
149 <property stdset="1"> 187 <property stdset="1">
150 <name>spacing</name> 188 <name>geometry</name>
151 <number>6</number> 189 <rect>
190 <x>10</x>
191 <y>20</y>
192 <width>200</width>
193 <height>53</height>
194 </rect>
152 </property> 195 </property>
153 <widget> 196 <grid>
154 <class>QLayoutWidget</class> 197 <property stdset="1">
198 <name>margin</name>
199 <number>0</number>
200 </property>
155 <property stdset="1"> 201 <property stdset="1">
156 <name>name</name> 202 <name>spacing</name>
157 <cstring>Layout6</cstring> 203 <number>6</number>
158 </property> 204 </property>
159 <hbox> 205 <spacer row="1" column="0" >
206 <property>
207 <name>name</name>
208 <cstring>Spacer2</cstring>
209 </property>
160 <property stdset="1"> 210 <property stdset="1">
161 <name>margin</name> 211 <name>orientation</name>
162 <number>0</number> 212 <enum>Vertical</enum>
163 </property> 213 </property>
164 <property stdset="1"> 214 <property stdset="1">
165 <name>spacing</name> 215 <name>sizeType</name>
166 <number>6</number> 216 <enum>Expanding</enum>
167 </property> 217 </property>
168 <widget> 218 <property>
169 <class>QCheckBox</class> 219 <name>sizeHint</name>
170 <property stdset="1"> 220 <size>
171 <name>name</name> 221 <width>20</width>
172 <cstring>chkAlarmPreset</cstring> 222 <height>20</height>
173 </property> 223 </size>
174 <property stdset="1"> 224 </property>
175 <name>text</name> 225 </spacer>
176 <string>Alarm Preset</string> 226 <widget row="0" column="0" >
177 </property> 227 <class>QLayoutWidget</class>
178 </widget> 228 <property stdset="1">
179 <widget> 229 <name>name</name>
180 <class>QSpinBox</class> 230 <cstring>Layout6</cstring>
181 <property stdset="1"> 231 </property>
182 <name>name</name> 232 <hbox>
183 <cstring>spinPreset</cstring>
184 </property>
185 <property stdset="1">
186 <name>enabled</name>
187 <bool>false</bool>
188 </property>
189 <property stdset="1"> 233 <property stdset="1">
190 <name>suffix</name> 234 <name>margin</name>
191 <string> minutes</string> 235 <number>0</number>
192 </property> 236 </property>
193 <property stdset="1"> 237 <property stdset="1">
194 <name>maxValue</name> 238 <name>spacing</name>
195 <number>180</number> 239 <number>6</number>
196 </property> 240 </property>
197 <property stdset="1"> 241 <widget>
198 <name>minValue</name> 242 <class>QCheckBox</class>
199 <number>0</number> 243 <property stdset="1">
244 <name>name</name>
245 <cstring>chkAlarmPreset</cstring>
246 </property>
247 <property stdset="1">
248 <name>text</name>
249 <string>Alarm Preset</string>
250 </property>
251 </widget>
252 <widget>
253 <class>QSpinBox</class>
254 <property stdset="1">
255 <name>name</name>
256 <cstring>spinPreset</cstring>
257 </property>
258 <property stdset="1">
259 <name>enabled</name>
260 <bool>false</bool>
261 </property>
262 <property stdset="1">
263 <name>suffix</name>
264 <string> minutes</string>
265 </property>
266 <property stdset="1">
267 <name>maxValue</name>
268 <number>180</number>
269 </property>
270 <property stdset="1">
271 <name>minValue</name>
272 <number>0</number>
273 </property>
274 <property stdset="1">
275 <name>lineStep</name>
276 <number>5</number>
277 </property>
278 <property stdset="1">
279 <name>value</name>
280 <number>5</number>
281 </property>
282 </widget>
283 </hbox>
284 </widget>
285 </grid>
286 </widget>
287 </widget>
288 <widget row="2" column="0" >
289 <class>QGroupBox</class>
290 <property stdset="1">
291 <name>name</name>
292 <cstring>fraMisc</cstring>
293 </property>
294 <property stdset="1">
295 <name>title</name>
296 <string>Misc</string>
297 </property>
298 <widget>
299 <class>QLayoutWidget</class>
300 <property stdset="1">
301 <name>name</name>
302 <cstring>Layout5</cstring>
303 </property>
304 <property stdset="1">
305 <name>geometry</name>
306 <rect>
307 <x>10</x>
308 <y>40</y>
309 <width>170</width>
310 <height>24</height>
311 </rect>
312 </property>
313 <hbox>
314 <property stdset="1">
315 <name>margin</name>
316 <number>0</number>
317 </property>
318 <property stdset="1">
319 <name>spacing</name>
320 <number>6</number>
321 </property>
322 <widget>
323 <class>QLabel</class>
324 <property stdset="1">
325 <name>name</name>
326 <cstring>TextLabel1</cstring>
327 </property>
328 <property stdset="1">
329 <name>text</name>
330 <string>Row style:</string>
331 </property>
332 </widget>
333 <widget>
334 <class>QComboBox</class>
335 <item>
336 <property>
337 <name>text</name>
338 <string>Default</string>
200 </property> 339 </property>
201 <property stdset="1"> 340 </item>
202 <name>lineStep</name> 341 <item>
203 <number>5</number> 342 <property>
343 <name>text</name>
344 <string>Medium</string>
204 </property> 345 </property>
205 <property stdset="1"> 346 </item>
206 <name>value</name> 347 <item>
207 <number>5</number> 348 <property>
349 <name>text</name>
350 <string>Large</string>
208 </property> 351 </property>
209 </widget> 352 </item>
210 </hbox> 353 <property stdset="1">
211 </widget> 354 <name>name</name>
212 </vbox> 355 <cstring>comboRowStyle</cstring>
356 </property>
357 </widget>
358 </hbox>
359 </widget>
360 <widget>
361 <class>QCheckBox</class>
362 <property stdset="1">
363 <name>name</name>
364 <cstring>chkJumpToCurTime</cstring>
365 </property>
366 <property stdset="1">
367 <name>geometry</name>
368 <rect>
369 <x>10</x>
370 <y>20</y>
371 <width>200</width>
372 <height>20</height>
373 </rect>
374 </property>
375 <property stdset="1">
376 <name>text</name>
377 <string>Jump to current time (dayview)</string>
378 </property>
379 </widget>
213 </widget> 380 </widget>
214 </vbox> 381 </grid>
215</widget> 382</widget>
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 8e88377..58a9c53 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -22,4 +22,4 @@
22#include <qvbox.h> 22#include <qvbox.h>
23#include <qsizepolicy.h> 23#include <qsizepolicy.h>
24#include <qabstractlayout.h> 24#include <qabstractlayout.h>
25#include <qtl.h> 25#include <qtl.h>
@@ -29,3 +29,3 @@ bool calcWeek(const QDate &d, int &week, int &year,
29 29
30DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, 30DateBookWeekLstHeader::DateBookWeekLstHeader(bool /*onM*/, QWidget* parent,
31 const char* name, WFlags fl) 31 const char* name, WFlags fl)
@@ -56,8 +56,8 @@ void DateBookWeekLstHeader::setDate(const QDate &d) {
56 labelWeek->setText("W: " + QString::number(week)); 56 labelWeek->setText("W: " + QString::number(week));
57 57
58 QDate start=date; 58 QDate start=date;
59 QDate stop=start.addDays(6); 59 QDate stop=start.addDays(6);
60 labelDate->setText( QString::number(start.day()) + " " + 60 labelDate->setText( QString::number(start.day()) + " " +
61 start.monthName(start.month()) + " - " + 61 start.monthName(start.month()) + " - " +
62 QString::number(stop.day()) + " " + 62 QString::number(stop.day()) + " " +
63 start.monthName(stop.month()) ); 63 start.monthName(stop.month()) );
@@ -94,5 +94,5 @@ void DateBookWeekLstHeader::prevWeek() {
94DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool onM, 94DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool onM,
95 QWidget* parent, 95 QWidget* parent,
96 const char* name, 96 const char* name,
97 WFlags fl ) 97 WFlags fl )
98 : DateBookWeekLstDayHdrBase(parent, name, fl) { 98 : DateBookWeekLstDayHdrBase(parent, name, fl) {
@@ -104,3 +104,3 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool onM,
104 104
105 label->setText( QString(QChar(day)) + " " + 105 label->setText( QString(QChar(day)) + " " +
106 QString::number(d.day()) ); 106 QString::number(d.day()) );
@@ -112,3 +112,3 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool onM,
112 label->setPalette(pal); 112 label->setPalette(pal);
113 113
114 /* 114 /*
@@ -141,5 +141,5 @@ void DateBookWeekLstDayHdr::newEvent() {
141} 141}
142DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev, 142DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
143 QWidget* parent, 143 QWidget* parent,
144 const char* name, 144 const char* name,
145 WFlags fl) : 145 WFlags fl) :
@@ -167,5 +167,5 @@ void DateBookWeekLstEvent::editMe() {
167 167
168DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, 168DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
169 const QDate &d, bool onM, 169 const QDate &d, bool onM,
170 QWidget* parent, 170 QWidget* parent,
171 const char* name, WFlags fl) 171 const char* name, WFlags fl)
@@ -178,3 +178,3 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
178 QVBoxLayout *layout = new QVBoxLayout( this ); 178 QVBoxLayout *layout = new QVBoxLayout( this );
179 179
180 qBubbleSort(ev); 180 qBubbleSort(ev);
@@ -184,3 +184,3 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
184 int dayOrder[7]; 184 int dayOrder[7];
185 if (onMonday) 185 if (onMonday)
186 for (int d=0; d<7; d++) dayOrder[d]=d+1; 186 for (int d=0; d<7; d++) dayOrder[d]=d+1;
@@ -195,8 +195,8 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
195 onMonday,this); 195 onMonday,this);
196 connect(hdr, SIGNAL(showDate(int,int,int)), 196 connect(hdr, SIGNAL(showDate(int,int,int)),
197 this, SIGNAL(showDate(int,int,int))); 197 this, SIGNAL(showDate(int,int,int)));
198 connect(hdr, SIGNAL(addEvent(const QDateTime &, 198 connect(hdr, SIGNAL(addEvent(const QDateTime &,
199 const QDateTime &, 199 const QDateTime &,
200 const QString &)), 200 const QString &)),
201 this, SIGNAL(addEvent(const QDateTime &, 201 this, SIGNAL(addEvent(const QDateTime &,
202 const QDateTime &, 202 const QDateTime &,
@@ -204,3 +204,3 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
204 layout->addWidget(hdr); 204 layout->addWidget(hdr);
205 205
206 // Events 206 // Events
@@ -213,3 +213,3 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
213 } 213 }
214 214
215 layout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding)); 215 layout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
@@ -220,6 +220,6 @@ void DateBookWeekLstView::keyPressEvent(QKeyEvent *e) {e->ignore();}
220 220
221DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, 221DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
222 QValueList<EffectiveEvent> &ev2, 222 QValueList<EffectiveEvent> &ev2,
223 QDate &d, bool onM, 223 QDate &d, bool onM,
224 QWidget* parent, 224 QWidget* parent,
225 const char* name, WFlags fl) 225 const char* name, WFlags fl)
@@ -253,4 +253,4 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
253 253
254DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB, 254DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
255 QWidget *parent, 255 QWidget *parent,
256 const char *name ) 256 const char *name )
@@ -268,6 +268,6 @@ DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
268 layout->addWidget( header ); 268 layout->addWidget( header );
269 connect(header, SIGNAL(dateChanged(int,int)), 269 connect(header, SIGNAL(dateChanged(int,int)),
270 this, SLOT(dateChanged(int,int))); 270 this, SLOT(dateChanged(int,int)));
271 connect(header, SIGNAL(setDbl(bool)), 271 connect(header, SIGNAL(setDbl(bool)),
272 this, SLOT(setDbl(bool))); 272 this, SLOT(setDbl(bool)));
273 273
@@ -312,3 +312,3 @@ QDate DateBookWeekLst::date() const {
312 else dow++; 312 else dow++;
313 313
314 d=d.addDays( (_week-1)*7 - dow + 1 ); 314 d=d.addDays( (_week-1)*7 - dow + 1 );