-rw-r--r-- | core/pim/datebook/datebook.cpp | 14 | ||||
-rw-r--r-- | core/pim/datebook/datebook.h | 2 | ||||
-rw-r--r-- | core/pim/datebook/datebook.pro | 3 | ||||
-rw-r--r-- | core/pim/datebook/datebookday.cpp | 53 | ||||
-rw-r--r-- | core/pim/datebook/datebookday.h | 6 | ||||
-rw-r--r-- | core/pim/datebook/datebooksettings.cpp | 20 | ||||
-rw-r--r-- | core/pim/datebook/datebooksettings.h | 5 | ||||
-rw-r--r-- | core/pim/datebook/datebooksettingsbase.ui | 197 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 2 |
9 files changed, 281 insertions, 21 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 | ||
162 | void 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 | |||
207 | void DateBookDay::setJumpToCurTime( bool bJump ) | ||
208 | { | ||
209 | jumpToCurTime = bJump; | ||
210 | } | ||
211 | |||
212 | void 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; |
280 | |||
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 | { | ||
260 | ts.init( startTime, 0 ); | 287 | ts.init( startTime, 0 ); |
261 | ts.expandTo( 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,2 +427,5 @@ void DateBookDay::relayoutPage( bool fromResize ) | |||
401 | 427 | ||
428 | if (jumpToCurTime && this->date() == QDate::currentDate()) | ||
429 | view->setContentsPos( 0, QTime::currentTime().hour() * view->rowHeight(0) ); //set listview to current hour | ||
430 | else | ||
402 | view->setContentsPos( 0, startTime * view->rowHeight(0) ); | 431 | view->setContentsPos( 0, startTime * view->rowHeight(0) ); |
@@ -446,2 +475,6 @@ void DateBookDay::relayoutPage( bool fromResize ) | |||
446 | } | 475 | } |
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 | ||
447 | view->setContentsPos( 0, startTime * view->rowHeight(0) ); | 480 | view->setContentsPos( 0, startTime * view->rowHeight(0) ); |
@@ -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; |
518 | |||
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 | { | ||
482 | ts.init( startTime, 0 ); | 525 | ts.init( startTime, 0 ); |
483 | ts.expandTo( 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 | |||
@@ -43,2 +43,4 @@ public: | |||
43 | 43 | ||
44 | void setRowStyle( int style ); | ||
45 | |||
44 | public slots: | 46 | public slots: |
@@ -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 | |||
137 | void DateBookSettings::setJumpToCurTime( bool bJump ) | ||
138 | { | ||
139 | chkJumpToCurTime->setChecked( bJump ); | ||
140 | } | ||
141 | |||
142 | bool DateBookSettings::jumpToCurTime() const | ||
143 | { | ||
144 | return chkJumpToCurTime->isChecked(); | ||
145 | } | ||
146 | |||
147 | void DateBookSettings::setRowStyle( int style ) | ||
148 | { | ||
149 | comboRowStyle->setCurrentItem( style ); | ||
150 | } | ||
151 | |||
152 | int 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 | |||
@@ -38,2 +38,7 @@ public: | |||
38 | 38 | ||
39 | void setJumpToCurTime( bool bJump ); | ||
40 | bool jumpToCurTime() const; | ||
41 | void setRowStyle( int style ); | ||
42 | int rowStyle() const; | ||
43 | |||
39 | private slots: | 44 | private 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,6 +75,21 @@ | |||
75 | </property> | 75 | </property> |
76 | <vbox> | 76 | <widget> |
77 | <class>QLayoutWidget</class> | ||
78 | <property stdset="1"> | ||
79 | <name>name</name> | ||
80 | <cstring>Layout6</cstring> | ||
81 | </property> | ||
82 | <property stdset="1"> | ||
83 | <name>geometry</name> | ||
84 | <rect> | ||
85 | <x>3</x> | ||
86 | <y>21</y> | ||
87 | <width>210</width> | ||
88 | <height>53</height> | ||
89 | </rect> | ||
90 | </property> | ||
91 | <grid> | ||
77 | <property stdset="1"> | 92 | <property stdset="1"> |
78 | <name>margin</name> | 93 | <name>margin</name> |
79 | <number>11</number> | 94 | <number>0</number> |
80 | </property> | 95 | </property> |
@@ -84,3 +99,24 @@ | |||
84 | </property> | 99 | </property> |
85 | <widget> | 100 | <spacer row="1" column="0" > |
101 | <property> | ||
102 | <name>name</name> | ||
103 | <cstring>Spacer1</cstring> | ||
104 | </property> | ||
105 | <property stdset="1"> | ||
106 | <name>orientation</name> | ||
107 | <enum>Vertical</enum> | ||
108 | </property> | ||
109 | <property stdset="1"> | ||
110 | <name>sizeType</name> | ||
111 | <enum>Expanding</enum> | ||
112 | </property> | ||
113 | <property> | ||
114 | <name>sizeHint</name> | ||
115 | <size> | ||
116 | <width>20</width> | ||
117 | <height>20</height> | ||
118 | </size> | ||
119 | </property> | ||
120 | </spacer> | ||
121 | <widget row="0" column="0" > | ||
86 | <class>QLayoutWidget</class> | 122 | <class>QLayoutWidget</class> |
@@ -131,5 +167,6 @@ | |||
131 | </widget> | 167 | </widget> |
132 | </vbox> | 168 | </grid> |
133 | </widget> | 169 | </widget> |
134 | <widget> | 170 | </widget> |
171 | <widget row="1" column="0" > | ||
135 | <class>QGroupBox</class> | 172 | <class>QGroupBox</class> |
@@ -143,6 +180,21 @@ | |||
143 | </property> | 180 | </property> |
144 | <vbox> | 181 | <widget> |
182 | <class>QLayoutWidget</class> | ||
183 | <property stdset="1"> | ||
184 | <name>name</name> | ||
185 | <cstring>Layout4</cstring> | ||
186 | </property> | ||
187 | <property stdset="1"> | ||
188 | <name>geometry</name> | ||
189 | <rect> | ||
190 | <x>10</x> | ||
191 | <y>20</y> | ||
192 | <width>200</width> | ||
193 | <height>53</height> | ||
194 | </rect> | ||
195 | </property> | ||
196 | <grid> | ||
145 | <property stdset="1"> | 197 | <property stdset="1"> |
146 | <name>margin</name> | 198 | <name>margin</name> |
147 | <number>11</number> | 199 | <number>0</number> |
148 | </property> | 200 | </property> |
@@ -152,3 +204,24 @@ | |||
152 | </property> | 204 | </property> |
153 | <widget> | 205 | <spacer row="1" column="0" > |
206 | <property> | ||
207 | <name>name</name> | ||
208 | <cstring>Spacer2</cstring> | ||
209 | </property> | ||
210 | <property stdset="1"> | ||
211 | <name>orientation</name> | ||
212 | <enum>Vertical</enum> | ||
213 | </property> | ||
214 | <property stdset="1"> | ||
215 | <name>sizeType</name> | ||
216 | <enum>Expanding</enum> | ||
217 | </property> | ||
218 | <property> | ||
219 | <name>sizeHint</name> | ||
220 | <size> | ||
221 | <width>20</width> | ||
222 | <height>20</height> | ||
223 | </size> | ||
224 | </property> | ||
225 | </spacer> | ||
226 | <widget row="0" column="0" > | ||
154 | <class>QLayoutWidget</class> | 227 | <class>QLayoutWidget</class> |
@@ -211,5 +284,99 @@ | |||
211 | </widget> | 284 | </widget> |
212 | </vbox> | 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> | ||
339 | </property> | ||
340 | </item> | ||
341 | <item> | ||
342 | <property> | ||
343 | <name>text</name> | ||
344 | <string>Medium</string> | ||
345 | </property> | ||
346 | </item> | ||
347 | <item> | ||
348 | <property> | ||
349 | <name>text</name> | ||
350 | <string>Large</string> | ||
351 | </property> | ||
352 | </item> | ||
353 | <property stdset="1"> | ||
354 | <name>name</name> | ||
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 | |||
@@ -29,3 +29,3 @@ bool calcWeek(const QDate &d, int &week, int &year, | |||
29 | 29 | ||
30 | DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, | 30 | DateBookWeekLstHeader::DateBookWeekLstHeader(bool /*onM*/, QWidget* parent, |
31 | const char* name, WFlags fl) | 31 | const char* name, WFlags fl) |