-rw-r--r-- | core/pim/datebook/datebook.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 1bc82a5..829f8f8 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -277,17 +277,21 @@ void DateBook::slotSettings() | |||
277 | #endif | 277 | #endif |
278 | 278 | ||
279 | if ( frmSettings.exec() ) { | 279 | if ( frmSettings.exec() ) { |
280 | |||
280 | aPreset = frmSettings.alarmPreset(); | 281 | aPreset = frmSettings.alarmPreset(); |
281 | presetTime = frmSettings.presetTime(); | 282 | presetTime = frmSettings.presetTime(); |
282 | startTime = frmSettings.startTime(); | 283 | startTime = frmSettings.startTime(); |
283 | bJumpToCurTime = frmSettings.jumpToCurTime(); | 284 | bJumpToCurTime = frmSettings.jumpToCurTime(); |
284 | rowStyle = frmSettings.rowStyle(); | 285 | rowStyle = frmSettings.rowStyle(); |
285 | if ( dayView ) | 286 | |
287 | if ( dayView ) { | ||
286 | dayView->setStartViewTime( startTime ); | 288 | dayView->setStartViewTime( startTime ); |
287 | dayView->setJumpToCurTime( bJumpToCurTime ); | 289 | dayView->setJumpToCurTime( bJumpToCurTime ); |
288 | dayView->setRowStyle( rowStyle ); | 290 | dayView->setRowStyle( rowStyle ); |
289 | if ( weekView ) | 291 | } |
292 | if ( weekView ) { | ||
290 | weekView->setStartViewTime( startTime ); | 293 | weekView->setStartViewTime( startTime ); |
294 | } | ||
291 | saveSettings(); | 295 | saveSettings(); |
292 | 296 | ||
293 | // make the change obvious | 297 | // make the change obvious |
@@ -548,10 +552,10 @@ void DateBook::initWeek() | |||
548 | connect( this, SIGNAL( newEvent() ), | 552 | connect( this, SIGNAL( newEvent() ), |
549 | weekView, SLOT( redraw() ) ); | 553 | weekView, SLOT( redraw() ) ); |
550 | } | 554 | } |
555 | |||
551 | //But also get it right: the year that we display can be different | 556 | //But also get it right: the year that we display can be different |
552 | //from the year of the current date. So, first find the year | 557 | //from the year of the current date. So, first find the year |
553 | //number of the current week. | 558 | //number of the current week. |
554 | |||
555 | int yearNumber, totWeeks; | 559 | int yearNumber, totWeeks; |
556 | calcWeek( currentDate(), totWeeks, yearNumber, onMonday ); | 560 | calcWeek( currentDate(), totWeeks, yearNumber, onMonday ); |
557 | 561 | ||
@@ -565,6 +569,7 @@ void DateBook::initWeek() | |||
565 | if ( totWeeks != weekView->totalWeeks() ) | 569 | if ( totWeeks != weekView->totalWeeks() ) |
566 | weekView->setTotalWeeks( totWeeks ); | 570 | weekView->setTotalWeeks( totWeeks ); |
567 | } | 571 | } |
572 | |||
568 | void DateBook::initWeekLst() { | 573 | void DateBook::initWeekLst() { |
569 | if ( !weekLstView ) { | 574 | if ( !weekLstView ) { |
570 | weekLstView = new DateBookWeekLst( ampm, onMonday, db, | 575 | weekLstView = new DateBookWeekLst( ampm, onMonday, db, |